Replace all #include <asm/kgdb.h> by #include <syslib/gen550.h> as the new KGDB
header doesn't have the necessary prototypes anymore.
Also, #include <linux/kgdb.h> where it was missing...

Signed-off-by: Sergey Shtylyov <[EMAIL PROTECTED]>

---
The patch is against the top of KGDB patchset in the linux_2_6_21_uprev branch.

 arch/ppc/platforms/4xx/bubinga.c |    2 +-
 arch/ppc/platforms/chestnut.c    |    2 +-
 arch/ppc/platforms/lopec.c       |    3 ++-
 arch/ppc/platforms/pplus.c       |    2 +-
 arch/ppc/platforms/sandpoint.c   |    2 +-
 arch/ppc/platforms/spruce.c      |    3 ++-
 arch/ppc/syslib/ppc4xx_setup.c   |    1 -
 7 files changed, 8 insertions(+), 7 deletions(-)

Index: linux-2.6/arch/ppc/platforms/4xx/bubinga.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/4xx/bubinga.c
+++ linux-2.6/arch/ppc/platforms/4xx/bubinga.c
@@ -21,6 +21,7 @@
 #include <linux/tty.h>
 #include <linux/serial.h>
 #include <linux/serial_core.h>
+#include <linux/kgdb.h>
 
 #include <asm/system.h>
 #include <asm/pci-bridge.h>
@@ -30,7 +31,6 @@
 #include <asm/time.h>
 #include <asm/io.h>
 #include <asm/todc.h>
-#include <asm/kgdb.h>
 #include <asm/ocp.h>
 #include <asm/ibm_ocp_pci.h>
 
Index: linux-2.6/arch/ppc/platforms/chestnut.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/chestnut.c
+++ linux-2.6/arch/ppc/platforms/chestnut.c
@@ -34,9 +34,9 @@
 #include <asm/io.h>
 #include <asm/hw_irq.h>
 #include <asm/machdep.h>
-#include <asm/kgdb.h>
 #include <asm/bootinfo.h>
 #include <asm/mv64x60.h>
+#include <syslib/gen550.h>
 #include <platforms/chestnut.h>
 
 static void __iomem *sram_base; /* Virtual addr of Internal SRAM */
Index: linux-2.6/arch/ppc/platforms/lopec.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/lopec.c
+++ linux-2.6/arch/ppc/platforms/lopec.c
@@ -32,7 +32,8 @@
 #include <asm/mpc10x.h>
 #include <asm/hw_irq.h>
 #include <asm/prep_nvram.h>
-#include <asm/kgdb.h>
+
+#include <syslib/gen550.h>
 
 /*
  * Define all of the IRQ senses and polarities.  Taken from the
Index: linux-2.6/arch/ppc/platforms/pplus.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/pplus.c
+++ linux-2.6/arch/ppc/platforms/pplus.c
@@ -35,9 +35,9 @@
 #include <asm/hawk.h>
 #include <asm/todc.h>
 #include <asm/bootinfo.h>
-#include <asm/kgdb.h>
 #include <asm/reg.h>
 
+#include <syslib/gen550.h>
 #include "pplus.h"
 
 #undef DUMP_DBATS
Index: linux-2.6/arch/ppc/platforms/sandpoint.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/sandpoint.c
+++ linux-2.6/arch/ppc/platforms/sandpoint.c
@@ -95,9 +95,9 @@
 #include <asm/bootinfo.h>
 #include <asm/mpc10x.h>
 #include <asm/pci-bridge.h>
-#include <asm/kgdb.h>
 #include <asm/ppc_sys.h>
 
+#include <syslib/gen550.h>
 #include "sandpoint.h"
 
 /* Set non-zero if an X2 Sandpoint detected. */
Index: linux-2.6/arch/ppc/platforms/spruce.c
===================================================================
--- linux-2.6.orig/arch/ppc/platforms/spruce.c
+++ linux-2.6/arch/ppc/platforms/spruce.c
@@ -27,6 +27,7 @@
 #include <linux/serial.h>
 #include <linux/tty.h>
 #include <linux/serial_core.h>
+#include <linux/kgdb.h>
 
 #include <asm/system.h>
 #include <asm/pgtable.h>
@@ -37,9 +38,9 @@
 #include <asm/time.h>
 #include <asm/todc.h>
 #include <asm/bootinfo.h>
-#include <asm/kgdb.h>
 
 #include <syslib/cpc700.h>
+#include <syslib/gen550.h>
 
 #include "spruce.h"
 
Index: linux-2.6/arch/ppc/syslib/ppc4xx_setup.c
===================================================================
--- linux-2.6.orig/arch/ppc/syslib/ppc4xx_setup.c
+++ linux-2.6/arch/ppc/syslib/ppc4xx_setup.c
@@ -32,7 +32,6 @@
 #include <asm/processor.h>
 #include <asm/machdep.h>
 #include <asm/page.h>
-#include <asm/kgdb.h>
 #include <asm/ibm4xx.h>
 #include <asm/time.h>
 #include <asm/todc.h>


-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Kgdb-bugreport mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/kgdb-bugreport

Reply via email to