diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 19:56:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-14 19:56:02 -0800 |
| commit | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (patch) | |
| tree | 980297c1747ca89354bc879cc5d17903eacb19e2 /arch/x86_64/mm/fault.c | |
| parent | 0174f72f848dfe7dc7488799776303c81b181b16 (diff) | |
| parent | d3ee871e63d0a0c70413dc0aa5534b8d6cd6ec37 (diff) | |
Merge x86-64 update from Andi
Diffstat (limited to 'arch/x86_64/mm/fault.c')
| -rw-r--r-- | arch/x86_64/mm/fault.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c index b75b872ec15..3a63707a698 100644 --- a/arch/x86_64/mm/fault.c +++ b/arch/x86_64/mm/fault.c @@ -308,18 +308,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs, unsigned long flags; siginfo_t info; -#ifdef CONFIG_CHECKING - { - unsigned long gs; - struct x8664_pda *pda = cpu_pda + stack_smp_processor_id(); - rdmsrl(MSR_GS_BASE, gs); - if (gs != (unsigned long)pda) { - wrmsrl(MSR_GS_BASE, pda); - printk("page_fault: wrong gs %lx expected %p\n", gs, pda); - } - } -#endif - /* get the address */ __asm__("movq %%cr2,%0":"=r" (address)); if (notify_die(DIE_PAGE_FAULT, "page fault", regs, error_code, 14, @@ -571,3 +559,10 @@ do_sigbus: force_sig_info(SIGBUS, &info, tsk); return; } + +static int __init enable_pagefaulttrace(char *str) +{ + page_fault_trace = 1; + return 0; +} +__setup("pagefaulttrace", enable_pagefaulttrace); |