fix xmon print_bug_trap compile error

PATCH In review Olaf Hering 2 participants 5 messages Mar 22, 2007 – Mar 23, 2007

Subsystems (2)

PowerPC Linux for power macintosh

lore

Share & tools

lore

Olaf Hering

author

2007-03-22 22:11 UTC #0 lore raw

PATCH 1/1 fix xmon print_bug_trap compile error

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 <[email protected]>

---
 arch/powerpc/xmon/xmon.c |    2 ++
 1 file changed, 2 insertions(+)

arch/powerpc/xmon/xmon.c +2 -0

Index: 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)

Olaf Hering

author

2007-03-22 22:13 UTC #1 lore raw

Re: [PATCH] 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' 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 <[email protected]>

---
 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(+)

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

Index: 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>

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

Index: 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,

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

Index: 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"

Olaf Hering

author

2007-03-23 00:11 UTC #2 lore raw

PATCH 1/1 remove unused inclusion of linux/ide.h

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 <[email protected]>

---
 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(-)

arch/powerpc/kernel/ppc_ksyms.c +0 -1

Index: 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>

arch/powerpc/kernel/setup-common.c +0 -1

Index: 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>

arch/powerpc/kernel/setup_64.c +0 -1

Index: 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>

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

Index: 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>

arch/powerpc/platforms/chrp/setup.c +0 -1

Index: 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>

arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +0 -1

Index: 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>

arch/powerpc/platforms/iseries/irq.c +0 -1

Index: 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>

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

Index: 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>

arch/powerpc/platforms/maple/setup.c +0 -1

Index: 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>

arch/powerpc/platforms/powermac/setup.c +0 -1

Index: 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>

Stephen Rothwell

2007-03-23 06:00 UTC #4 lore raw

In reply to Olaf Hering

Quoted 3 lines · On Thu, 22 Mar 2007 23:11:17 +0100 Olaf Hering <[email protected]> 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 [email protected]
http://www.canb.auug.org.au/~sfr/

Stephen Rothwell

2007-03-23 07:16 UTC #3 lore raw

Re: [PATCH] fix link errors when eeh is disabled

In reply to Olaf Hering

Quoted 16 lines · On Thu, 22 Mar 2007 23:14:07 +0100 Olaf Hering <[email protected]> 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 [email protected]
http://www.canb.auug.org.au/~sfr/