diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-01 17:57:25 +1000 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-07-01 17:57:25 +1000 |
| commit | 24a72acac155576d630cf4304fa9cefb9b62ea1f (patch) | |
| tree | 84d09427b319c613512316c658a3f6d6d8fe3dd1 /arch/powerpc/kernel/eeh_cache.c | |
| parent | 6e0b8bc965d25a8e0701eaca3fca5941b4f4b2b2 (diff) | |
| parent | 8bb495e3f02401ee6f76d1b1d77f3ac9f079e376 (diff) | |
| download | kernel_goldelico_gta04-24a72acac155576d630cf4304fa9cefb9b62ea1f.zip kernel_goldelico_gta04-24a72acac155576d630cf4304fa9cefb9b62ea1f.tar.gz kernel_goldelico_gta04-24a72acac155576d630cf4304fa9cefb9b62ea1f.tar.bz2 | |
Merge tag 'v3.10' into next
Merge 3.10 in order to get some of the last minute powerpc
changes, resolve conflicts and add additional fixes on top
of them.
Diffstat (limited to 'arch/powerpc/kernel/eeh_cache.c')
| -rw-r--r-- | arch/powerpc/kernel/eeh_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/eeh_cache.c b/arch/powerpc/kernel/eeh_cache.c index ea9a94c..f9ac123 100644 --- a/arch/powerpc/kernel/eeh_cache.c +++ b/arch/powerpc/kernel/eeh_cache.c @@ -294,8 +294,6 @@ void eeh_addr_cache_build(void) spin_lock_init(&pci_io_addr_cache_root.piar_lock); for_each_pci_dev(dev) { - eeh_addr_cache_insert_dev(dev); - dn = pci_device_to_OF_node(dev); if (!dn) continue; @@ -308,6 +306,8 @@ void eeh_addr_cache_build(void) dev->dev.archdata.edev = edev; edev->pdev = dev; + eeh_addr_cache_insert_dev(dev); + eeh_sysfs_add_device(dev); } |