diff options
author | Jan Beulich <jbeulich@novell.com> | 2006-02-03 15:51:47 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-04 19:43:15 -0500 |
commit | d646bce4c77af72f5a293a96fbf14174c9f2a9c2 (patch) | |
tree | c931154a172dd17a242c455c23d21c2adf7240df /arch | |
parent | 91522a964b295e7bccb173218cc00adadfc77bbf (diff) |
[PATCH] x86_64: minor odering correction to dump_pagetable()
Checking of the validity of pointers should be consistently done before
dereferencing the pointer.
Signed-Off-By: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86_64/mm/fault.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index 26eac194064b..2e7c3c8ffe03 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c | |||
@@ -33,7 +33,6 @@ | |||
33 | #include <asm/proto.h> | 33 | #include <asm/proto.h> |
34 | #include <asm/kdebug.h> | 34 | #include <asm/kdebug.h> |
35 | #include <asm-generic/sections.h> | 35 | #include <asm-generic/sections.h> |
36 | #include <asm/kdebug.h> | ||
37 | 36 | ||
38 | /* Page fault error code bits */ | 37 | /* Page fault error code bits */ |
39 | #define PF_PROT (1<<0) /* or no page found */ | 38 | #define PF_PROT (1<<0) /* or no page found */ |
@@ -157,8 +156,8 @@ void dump_pagetable(unsigned long address) | |||
157 | 156 | ||
158 | pgd = __va((unsigned long)pgd & PHYSICAL_PAGE_MASK); | 157 | pgd = __va((unsigned long)pgd & PHYSICAL_PAGE_MASK); |
159 | pgd += pgd_index(address); | 158 | pgd += pgd_index(address); |
160 | printk("PGD %lx ", pgd_val(*pgd)); | ||
161 | if (bad_address(pgd)) goto bad; | 159 | if (bad_address(pgd)) goto bad; |
160 | printk("PGD %lx ", pgd_val(*pgd)); | ||
162 | if (!pgd_present(*pgd)) goto ret; | 161 | if (!pgd_present(*pgd)) goto ret; |
163 | 162 | ||
164 | pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address); | 163 | pud = __pud_offset_k((pud_t *)pgd_page(*pgd), address); |