From f5fb02189c1c8c5b98f457738ef436ba4b748d48 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Fri, 19 Oct 2007 20:35:02 +0200
Subject: [PATCH] --- yaml --- r: 71679 b: refs/heads/master c:
 af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a h: refs/heads/master i:   71677:
 cca6d789ea72c5efe61b1c3e298753809714a469   71675:
 ae23dc5bb62debf0a2add615542919aac86e2601   71671:
 ea49a0dc4ecbea7a7edc082ef4d0e46bbe3a41e4   71663:
 b53587b72a3b2749cde347c60050a9258a86ba5f   71647:
 df8799facd02f2135bce3e409d545362ffe0064b   71615:
 d27b491ba18e38a1c5369320bab446324f16d325   71551:
 115b91ab7712573882a0a4497f6f27e0aa0bb39e   71423:
 a710eead3e4a1db4396808cb73ebd33d27d7f1a9   71167:
 f069433b38610cd72b9b383f1c96bf05a5c7eb47   70655:
 8cebdcc8a85483c6e710809fdb4e9f12dcac0e69   69631:
 921ed091ac973f311a586ba30584b5d916137860 v: v3

---
 [refs]                       |  2 +-
 trunk/arch/x86/mm/fault_64.c | 12 ------------
 2 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index b6d9d612e5e6..2356ac77dea0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 096708dcf71de6ab5f839ae68ee42275673dc178
+refs/heads/master: af93ebc0b3ed8cdf93a6ed4bc1fab548f8059d0a
diff --git a/trunk/arch/x86/mm/fault_64.c b/trunk/arch/x86/mm/fault_64.c
index 5e0e54906c48..af79cf60866c 100644
--- a/trunk/arch/x86/mm/fault_64.c
+++ b/trunk/arch/x86/mm/fault_64.c
@@ -285,7 +285,6 @@ static int vmalloc_fault(unsigned long address)
 	return 0;
 }
 
-static int page_fault_trace;
 int show_unhandled_signals = 1;
 
 /*
@@ -354,10 +353,6 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
 	if (likely(regs->eflags & X86_EFLAGS_IF))
 		local_irq_enable();
 
-	if (unlikely(page_fault_trace))
-		printk("pagefault rip:%lx rsp:%lx cs:%lu ss:%lu address %lx error %lx\n",
-		       regs->rip,regs->rsp,regs->cs,regs->ss,address,error_code); 
-
 	if (unlikely(error_code & PF_RSVD))
 		pgtable_bad(address, regs, error_code);
 
@@ -621,10 +616,3 @@ void vmalloc_sync_all(void)
 	BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == 
 				(__START_KERNEL & PGDIR_MASK)));
 }
-
-static int __init enable_pagefaulttrace(char *str)
-{
-	page_fault_trace = 1;
-	return 1;
-}
-__setup("pagefaulttrace", enable_pagefaulttrace);