From 9d47ac5d61543c6d35740fcce90cbab734bbc801 Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Fri, 3 Feb 2006 21:51:47 +0100
Subject: [PATCH] --- yaml --- r: 19783 b: refs/heads/master c:
 d646bce4c77af72f5a293a96fbf14174c9f2a9c2 h: refs/heads/master i:   19781:
 0ee6baa26c35f75fe07be9237d9269483c95a66a   19779:
 4f8c1ec61323e4c501e6f8c5feefa0a3c1ad0eea   19775:
 447814d5a30bac67358436eda0f30a1121b6c2ee v: v3

---
 [refs]                       | 2 +-
 trunk/arch/x86_64/mm/fault.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 2c8f29177fd0..88a532f79374 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91522a964b295e7bccb173218cc00adadfc77bbf
+refs/heads/master: d646bce4c77af72f5a293a96fbf14174c9f2a9c2
diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c
index 26eac194064b..2e7c3c8ffe03 100644
--- a/trunk/arch/x86_64/mm/fault.c
+++ b/trunk/arch/x86_64/mm/fault.c
@@ -33,7 +33,6 @@
 #include <asm/proto.h>
 #include <asm/kdebug.h>
 #include <asm-generic/sections.h>
-#include <asm/kdebug.h>
 
 /* Page fault error code bits */
 #define PF_PROT	(1<<0)		/* or no page found */
@@ -157,8 +156,8 @@ void dump_pagetable(unsigned long address)
 
 	pgd = __va((unsigned long)pgd & PHYSICAL_PAGE_MASK); 
 	pgd += pgd_index(address);
-	printk("PGD %lx ", pgd_val(*pgd));
 	if (bad_address(pgd)) goto bad;
+	printk("PGD %lx ", pgd_val(*pgd));
 	if (!pgd_present(*pgd)) goto ret; 
 
 	pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address);