diff options
| author | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:46:04 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2015-12-16 15:46:04 +0800 |
| commit | 08671464b7991cdbc2928243fbde2458357b2ce8 (patch) | |
| tree | 9df6728d1d3dc885e3dba5031c22408cb59a3eec /arch/powerpc/platforms/pseries/iommu.c | |
| parent | abacc500b7cddb62f7efc04d7c21d56375f42646 (diff) | |
| parent | 37e8e4f1465886675b03c37e9221658568ceb8f7 (diff) | |
Merge branch 'v3.18/topic/of-overlay' into linux-linaro-lsk-v3.18lsk-v3.18-15.12linux-linaro-lsk-v3.18-test
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/iommu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c index e32e00976a94..3e5bfdafee63 100644 --- a/arch/powerpc/platforms/pseries/iommu.c +++ b/arch/powerpc/platforms/pseries/iommu.c @@ -1251,10 +1251,11 @@ static struct notifier_block iommu_mem_nb = { .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; - 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; |