* [PATCH] fix xmon print_bug_trap compile error
@ 2007-03-22 22:11 Olaf Hering
2007-03-22 22:14 ` [PATCH] fix link errors when eeh is disabled Olaf Hering
2007-03-23 6:00 ` [PATCH] fix xmon print_bug_trap compile error Stephen Rothwell
0 siblings, 2 replies; 5+ messages in thread
From: Olaf Hering @ 2007-03-22 22:11 UTC (permalink / raw)
To: Paul Mackeras, linuxppc-dev
These 2 members of struct bug_entry are inside CONFIG_DEBUG_BUGVERBOSE
arch/powerpc/xmon/xmon.c:1364: error: 'const struct bug_entry' has no member named 'file'
arch/powerpc/xmon/xmon.c:1364: error: 'const struct bug_entry' has no member named 'line'
Signed-off-by: Olaf Hering <olaf@aepfle.de>
---
arch/powerpc/xmon/xmon.c | 2 ++
1 file changed, 2 insertions(+)
Index: b/arch/powerpc/xmon/xmon.c
===================================================================
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -1360,8 +1360,10 @@ static void print_bug_trap(struct pt_reg
if (is_warning_bug(bug))
return;
+#ifdef CONFIG_DEBUG_BUGVERBOSE
printf("kernel BUG at %s:%u!\n",
bug->file, bug->line);
+#endif
}
void excprint(struct pt_regs *fp)
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] fix link errors when eeh is disabled 2007-03-22 22:11 [PATCH] fix xmon print_bug_trap compile error Olaf Hering @ 2007-03-22 22:14 ` Olaf Hering 2007-03-23 0:11 ` [PATCH] remove unused inclusion of linux/ide.h Olaf Hering 2007-03-23 7:16 ` [PATCH] fix link errors when eeh is disabled Stephen Rothwell 2007-03-23 6:00 ` [PATCH] fix xmon print_bug_trap compile error Stephen Rothwell 1 sibling, 2 replies; 5+ messages in thread From: Olaf Hering @ 2007-03-22 22:14 UTC (permalink / raw) To: Paul Mackeras, linuxppc-dev 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' arch/powerpc/platforms/built-in.o: In function `.pSeries_setup_arch': setup.c:(.init.text+0x620): undefined reference to `.eeh_init' make[1]: *** [.tmp_vmlinux1] Error 1 Signed-off-by: Olaf Hering <olaf@aepfle.de> --- arch/powerpc/platforms/pseries/pci.c | 1 + arch/powerpc/platforms/pseries/pci_dlpar.c | 1 + arch/powerpc/platforms/pseries/setup.c | 1 + 3 files changed, 3 insertions(+) Index: b/arch/powerpc/platforms/pseries/pci.c =================================================================== --- a/arch/powerpc/platforms/pseries/pci.c +++ b/arch/powerpc/platforms/pseries/pci.c @@ -25,6 +25,7 @@ #include <linux/pci.h> #include <linux/string.h> +#include <asm/eeh.h> #include <asm/pci-bridge.h> #include <asm/prom.h> #include <asm/ppc-pci.h> Index: b/arch/powerpc/platforms/pseries/pci_dlpar.c =================================================================== --- a/arch/powerpc/platforms/pseries/pci_dlpar.c +++ b/arch/powerpc/platforms/pseries/pci_dlpar.c @@ -29,6 +29,7 @@ #include <asm/pci-bridge.h> #include <asm/ppc-pci.h> #include <asm/firmware.h> +#include <asm/eeh.h> static struct pci_bus * find_bus_among_children(struct pci_bus *bus, Index: b/arch/powerpc/platforms/pseries/setup.c =================================================================== --- a/arch/powerpc/platforms/pseries/setup.c +++ b/arch/powerpc/platforms/pseries/setup.c @@ -65,6 +65,7 @@ #include <asm/udbg.h> #include <asm/smp.h> #include <asm/firmware.h> +#include <asm/eeh.h> #include "plpar_wrappers.h" #include "pseries.h" ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] remove unused inclusion of linux/ide.h 2007-03-22 22:14 ` [PATCH] fix link errors when eeh is disabled Olaf Hering @ 2007-03-23 0:11 ` Olaf Hering 2007-03-23 7:16 ` [PATCH] fix link errors when eeh is disabled Stephen Rothwell 1 sibling, 0 replies; 5+ messages in thread From: Olaf Hering @ 2007-03-23 0:11 UTC (permalink / raw) To: Paul Mackeras, linuxppc-dev Remove unneeded inclusion of linux/ide.h It does not compile with CONFIG_BLOCK=n Remove asm/ide.h from ksyms file, it gets included earlier via linux/ide.h Compile tested with all defconfig files. Signed-off-by: Olaf Hering <olaf@aepfle.de> --- arch/powerpc/kernel/ppc_ksyms.c | 1 - arch/powerpc/kernel/setup-common.c | 1 - arch/powerpc/kernel/setup_64.c | 1 - arch/powerpc/platforms/chrp/pci.c | 1 - arch/powerpc/platforms/chrp/setup.c | 1 - arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 1 - arch/powerpc/platforms/iseries/irq.c | 1 - arch/powerpc/platforms/iseries/pci.c | 1 - arch/powerpc/platforms/maple/setup.c | 1 - arch/powerpc/platforms/powermac/setup.c | 1 - 10 files changed, 10 deletions(-) Index: b/arch/powerpc/kernel/ppc_ksyms.c =================================================================== --- a/arch/powerpc/kernel/ppc_ksyms.c +++ b/arch/powerpc/kernel/ppc_ksyms.c @@ -20,7 +20,6 @@ #include <asm/processor.h> #include <asm/uaccess.h> #include <asm/io.h> -#include <asm/ide.h> #include <asm/atomic.h> #include <asm/checksum.h> #include <asm/pgtable.h> Index: b/arch/powerpc/kernel/setup-common.c =================================================================== --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c @@ -21,7 +21,6 @@ #include <linux/delay.h> #include <linux/initrd.h> #include <linux/platform_device.h> -#include <linux/ide.h> #include <linux/seq_file.h> #include <linux/ioport.h> #include <linux/console.h> Index: b/arch/powerpc/kernel/setup_64.c =================================================================== --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -20,7 +20,6 @@ #include <linux/reboot.h> #include <linux/delay.h> #include <linux/initrd.h> -#include <linux/ide.h> #include <linux/seq_file.h> #include <linux/ioport.h> #include <linux/console.h> Index: b/arch/powerpc/platforms/chrp/pci.c =================================================================== --- a/arch/powerpc/platforms/chrp/pci.c +++ b/arch/powerpc/platforms/chrp/pci.c @@ -7,7 +7,6 @@ #include <linux/delay.h> #include <linux/string.h> #include <linux/init.h> -#include <linux/ide.h> #include <asm/io.h> #include <asm/pgtable.h> Index: b/arch/powerpc/platforms/chrp/setup.c =================================================================== --- a/arch/powerpc/platforms/chrp/setup.c +++ b/arch/powerpc/platforms/chrp/setup.c @@ -28,7 +28,6 @@ #include <linux/adb.h> #include <linux/module.h> #include <linux/delay.h> -#include <linux/ide.h> #include <linux/console.h> #include <linux/seq_file.h> #include <linux/root_dev.h> Index: b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c =================================================================== --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c @@ -25,7 +25,6 @@ #include <linux/console.h> #include <linux/delay.h> #include <linux/irq.h> -#include <linux/ide.h> #include <linux/seq_file.h> #include <linux/root_dev.h> #include <linux/serial.h> Index: b/arch/powerpc/platforms/iseries/irq.c =================================================================== --- a/arch/powerpc/platforms/iseries/irq.c +++ b/arch/powerpc/platforms/iseries/irq.c @@ -30,7 +30,6 @@ #include <linux/param.h> #include <linux/string.h> #include <linux/bootmem.h> -#include <linux/ide.h> #include <linux/irq.h> #include <linux/spinlock.h> Index: b/arch/powerpc/platforms/iseries/pci.c =================================================================== --- a/arch/powerpc/platforms/iseries/pci.c +++ b/arch/powerpc/platforms/iseries/pci.c @@ -24,7 +24,6 @@ #include <linux/string.h> #include <linux/init.h> #include <linux/module.h> -#include <linux/ide.h> #include <linux/pci.h> #include <asm/io.h> Index: b/arch/powerpc/platforms/maple/setup.c =================================================================== --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -32,7 +32,6 @@ #include <linux/initrd.h> #include <linux/vt_kern.h> #include <linux/console.h> -#include <linux/ide.h> #include <linux/pci.h> #include <linux/adb.h> #include <linux/cuda.h> Index: b/arch/powerpc/platforms/powermac/setup.c =================================================================== --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c @@ -42,7 +42,6 @@ #include <linux/initrd.h> #include <linux/vt_kern.h> #include <linux/console.h> -#include <linux/ide.h> #include <linux/pci.h> #include <linux/adb.h> #include <linux/cuda.h> ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fix link errors when eeh is disabled 2007-03-22 22:14 ` [PATCH] fix link errors when eeh is disabled Olaf Hering 2007-03-23 0:11 ` [PATCH] remove unused inclusion of linux/ide.h Olaf Hering @ 2007-03-23 7:16 ` Stephen Rothwell 1 sibling, 0 replies; 5+ messages in thread From: Stephen Rothwell @ 2007-03-23 7:16 UTC (permalink / raw) To: Olaf Hering; +Cc: linuxppc-dev, Paul Mackeras [-- Attachment #1: Type: text/plain, Size: 1215 bytes --] On Thu, 22 Mar 2007 23:14:07 +0100 Olaf Hering <olaf@aepfle.de> wrote: > > 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' > arch/powerpc/platforms/built-in.o: In function `.pSeries_setup_arch': > setup.c:(.init.text+0x620): undefined reference to `.eeh_init' > make[1]: *** [.tmp_vmlinux1] Error 1 This was partly fixed by commit bed59275810a55500e885cbdc5c2a0507f13c00e in Paulus' powerpc tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] fix xmon print_bug_trap compile error 2007-03-22 22:11 [PATCH] fix xmon print_bug_trap compile error Olaf Hering 2007-03-22 22:14 ` [PATCH] fix link errors when eeh is disabled Olaf Hering @ 2007-03-23 6:00 ` Stephen Rothwell 1 sibling, 0 replies; 5+ messages in thread From: Stephen Rothwell @ 2007-03-23 6:00 UTC (permalink / raw) To: Olaf Hering; +Cc: linuxppc-dev, Paul Mackeras [-- Attachment #1: Type: text/plain, Size: 342 bytes --] On Thu, 22 Mar 2007 23:11:17 +0100 Olaf Hering <olaf@aepfle.de> wrote: > > > These 2 members of struct bug_entry are inside CONFIG_DEBUG_BUGVERBOSE This is fixed by commit 0a7c7efccc08f00ae6fc8e1f2de0ee61f07357fd in Paulus' powerpc tree. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ [-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2007-03-23 7:16 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2007-03-22 22:11 [PATCH] fix xmon print_bug_trap compile error Olaf Hering 2007-03-22 22:14 ` [PATCH] fix link errors when eeh is disabled Olaf Hering 2007-03-23 0:11 ` [PATCH] remove unused inclusion of linux/ide.h Olaf Hering 2007-03-23 7:16 ` [PATCH] fix link errors when eeh is disabled Stephen Rothwell 2007-03-23 6:00 ` [PATCH] fix xmon print_bug_trap compile error Stephen Rothwell
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.