projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.86' into linux-linaro-lsk-v3.10
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
platforms
/
pseries
/
iommu.c
diff --git
a/arch/powerpc/platforms/pseries/iommu.c
b/arch/powerpc/platforms/pseries/iommu.c
index 86ae364900d60cbde3000d44481e248e9895609a..ed02eb47ac70c8a3b7ae43119929864a48d54271 100644
(file)
--- a/
arch/powerpc/platforms/pseries/iommu.c
+++ b/
arch/powerpc/platforms/pseries/iommu.c
@@
-1325,10
+1325,11
@@
static struct notifier_block iommu_mem_nb = {
.notifier_call = iommu_mem_notifier,
};
.notifier_call = iommu_mem_notifier,
};
-static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *
node
)
+static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *
data
)
{
int err = NOTIFY_OK;
{
int err = NOTIFY_OK;
- struct device_node *np = node;
+ struct of_reconfig_data *rd = data;
+ struct device_node *np = rd->dn;
struct pci_dn *pci = PCI_DN(np);
struct direct_window *window;
struct pci_dn *pci = PCI_DN(np);
struct direct_window *window;