diff options
| author | Vegard Nossum <vegard.nossum@gmail.com> | 2008-10-03 17:54:25 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:33:15 +0200 |
| commit | af5c2bd16ac2e5688c3bf46ea1f95112d696d294 (patch) | |
| tree | 80e08edc5c93999f083039a81b65fbf05d47954b /arch/x86/kernel/doublefault_32.c | |
| parent | 7f2f49a58283110083a7358d2d98025a11653373 (diff) | |
| download | op-kernel-dev-af5c2bd16ac2e5688c3bf46ea1f95112d696d294.zip op-kernel-dev-af5c2bd16ac2e5688c3bf46ea1f95112d696d294.tar.gz | |
x86: fix virt_addr_valid() with CONFIG_DEBUG_VIRTUAL=y, v2
virt_addr_valid() calls __pa(), which calls __phys_addr(). With
CONFIG_DEBUG_VIRTUAL=y, __phys_addr() will kill the kernel if the
address *isn't* valid. That's clearly wrong for virt_addr_valid().
We also incorporate the debugging checks into virt_addr_valid().
Signed-off-by: Vegard Nossum <vegardno@ben.ifi.uio.no>
Acked-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/doublefault_32.c')
| -rw-r--r-- | arch/x86/kernel/doublefault_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/doublefault_32.c b/arch/x86/kernel/doublefault_32.c index 395acb1..b4f14c6 100644 --- a/arch/x86/kernel/doublefault_32.c +++ b/arch/x86/kernel/doublefault_32.c @@ -66,6 +66,6 @@ struct tss_struct doublefault_tss __cacheline_aligned = { .ds = __USER_DS, .fs = __KERNEL_PERCPU, - .__cr3 = __phys_addr_const((unsigned long)swapper_pg_dir) + .__cr3 = __pa_nodebug(swapper_pg_dir), } }; |
