From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 Documentation/DocBook/Makefile |    2 +-
 drivers/serial/pxa.c           |    3 +++
 include/asm-i386/kdebug.h      |    1 +
 include/asm-x86_64/kdebug.h    |    1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff -puN Documentation/DocBook/Makefile~git-kgdb-fixup Documentation/DocBook/Makefile
--- a/Documentation/DocBook/Makefile~git-kgdb-fixup
+++ a/Documentation/DocBook/Makefile
@@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mc
 	    procfs-guide.xml writing_usb_driver.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \
 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-	    genericirq.xml s390-drivers.xml
+	    genericirq.xml s390-drivers.xml kgdb.xml
 
 ###
 # The build process is as follows (targets):
diff -puN drivers/serial/pxa.c~git-kgdb-fixup drivers/serial/pxa.c
--- a/drivers/serial/pxa.c~git-kgdb-fixup
+++ a/drivers/serial/pxa.c
@@ -43,6 +43,9 @@
 #include <linux/tty_flip.h>
 #include <linux/serial_core.h>
 #include <linux/clk.h>
+#ifdef CONFIG_KGDB_CONSOLE
+#include <linux/kgdb.h>
+#endif
 
 #include <asm/io.h>
 #include <asm/hardware.h>
diff -puN include/asm-i386/kdebug.h~git-kgdb-fixup include/asm-i386/kdebug.h
--- a/include/asm-i386/kdebug.h~git-kgdb-fixup
+++ a/include/asm-i386/kdebug.h
@@ -22,6 +22,7 @@ enum die_val {
 	DIE_GPF,
 	DIE_CALL,
 	DIE_NMI_IPI,
+	DIE_PAGE_FAULT_NO_CONTEXT,
 };
 
 #endif
diff -puN include/asm-x86_64/kdebug.h~git-kgdb-fixup include/asm-x86_64/kdebug.h
--- a/include/asm-x86_64/kdebug.h~git-kgdb-fixup
+++ a/include/asm-x86_64/kdebug.h
@@ -19,6 +19,7 @@ enum die_val {
 	DIE_GPF,
 	DIE_CALL,
 	DIE_NMI_IPI,
+	DIE_PAGE_FAULT_NO_CONTEXT,
 };
 
 extern void printk_address(unsigned long address);
_