[PATCH] x86_64: Remove CONFIG_CHECKING and add command line option for pagefault tracing

CONFIG_CHECKING covered some debugging code used in the early times
of the port. But it wasn't even SMP safe for quite some time
and the bugs it checked for seem to be gone.

This patch removes all the code to verify GS at kernel entry. There
haven't been any new bugs in this area for a long time.

Previously it also covered the sysctl for the page fault tracing.
That didn't make much sense because that code was unconditionally
compiled in. I made that a boot option now because it is typically
only useful at boot.

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

2 files changed, 7 insertions, 16 deletions

diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index b75b872ec154..3a63707a698b 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);
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index 854a41b8372b..286f6a624c3a 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -565,10 +565,6 @@ extern int exception_trace, page_fault_trace;
 static ctl_table debug_table2[] = {
         { 99, "exception-trace", &exception_trace, sizeof(int), 0644, NULL,
           proc_dointvec },
-#ifdef CONFIG_CHECKING
-        { 100, "page-fault-trace", &page_fault_trace, sizeof(int), 0644, NULL,
-          proc_dointvec },
-#endif
         { 0, }
 };