diff --git a/[refs] b/[refs] index e255638bce21..e1a29f8cfc0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f30c00702aca3229e1157718675f0ee56d2a931 +refs/heads/master: 74a1ddc597d83d5ca6541b15a15f80a3722e3a1e diff --git a/trunk/arch/x86_64/mm/fault.c b/trunk/arch/x86_64/mm/fault.c index 84f11728fc76..99a801811671 100644 --- a/trunk/arch/x86_64/mm/fault.c +++ b/trunk/arch/x86_64/mm/fault.c @@ -301,7 +301,7 @@ static int vmalloc_fault(unsigned long address) return 0; } -int page_fault_trace = 0; +static int page_fault_trace; int exception_trace = 1; /* diff --git a/trunk/arch/x86_64/mm/init.c b/trunk/arch/x86_64/mm/init.c index 2f673225a51f..381c2ecd407e 100644 --- a/trunk/arch/x86_64/mm/init.c +++ b/trunk/arch/x86_64/mm/init.c @@ -700,8 +700,6 @@ int kern_addr_valid(unsigned long addr) #ifdef CONFIG_SYSCTL #include -extern int exception_trace, page_fault_trace; - static ctl_table debug_table2[] = { { .ctl_name = 99,