浏览代码

[POWERPC] Fix link errors when EEH is disabled

Fix link errors with CONFIG_EEH=n:

arch/powerpc/platforms/built-in.o: In function `.pcibios_fixup_new_pci_devices':
(.text+0x41c8): undefined reference to `.eeh_add_device_tree_late'
arch/powerpc/platforms/built-in.o: In function `.init_phb_dynamic':
(.text+0x4280): undefined reference to `.eeh_add_device_tree_early'
arch/powerpc/platforms/built-in.o: In function `.pcibios_remove_pci_devices':
(.text+0x42fc): undefined reference to `.eeh_remove_bus_device'
arch/powerpc/platforms/built-in.o: In function `.pcibios_add_pci_devices':
(.text+0x43c0): undefined reference to `.eeh_add_device_tree_early'
arch/powerpc/platforms/built-in.o: In function `.pSeries_final_fixup':
(.init.text+0xb4): undefined reference to `.pci_addr_cache_build'
make[1]: *** [.tmp_vmlinux1] Error 1

Signed-off-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Olaf Hering 18 年之前
父节点
当前提交
c3b9d9ab96
共有 2 个文件被更改,包括 2 次插入0 次删除
  1. 1 0
      arch/powerpc/platforms/pseries/pci.c
  2. 1 0
      arch/powerpc/platforms/pseries/pci_dlpar.c

+ 1 - 0
arch/powerpc/platforms/pseries/pci.c

@@ -25,6 +25,7 @@
 #include <linux/pci.h>
 #include <linux/pci.h>
 #include <linux/string.h>
 #include <linux/string.h>
 
 
+#include <asm/eeh.h>
 #include <asm/pci-bridge.h>
 #include <asm/pci-bridge.h>
 #include <asm/prom.h>
 #include <asm/prom.h>
 #include <asm/ppc-pci.h>
 #include <asm/ppc-pci.h>

+ 1 - 0
arch/powerpc/platforms/pseries/pci_dlpar.c

@@ -29,6 +29,7 @@
 #include <asm/pci-bridge.h>
 #include <asm/pci-bridge.h>
 #include <asm/ppc-pci.h>
 #include <asm/ppc-pci.h>
 #include <asm/firmware.h>
 #include <asm/firmware.h>
+#include <asm/eeh.h>
 
 
 static struct pci_bus *
 static struct pci_bus *
 find_bus_among_children(struct pci_bus *bus,
 find_bus_among_children(struct pci_bus *bus,