From 3fae97f02e6d9ed6e9283ad419163153dbbed0fd Mon Sep 17 00:00:00 2001
From: Jan Beulich <jbeulich@novell.com>
Date: Wed, 30 Jan 2008 13:31:21 +0100
Subject: [PATCH] --- yaml --- r: 80009 b: refs/heads/master c:
 bdb4f156064e5f627213af82292eb8b5cf2dc5aa h: refs/heads/master i:   80007:
 3b622ed7aa930b3302708888a32c3c17ab195220 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/x86/kernel/process_32.c   | 4 ++--
 trunk/include/asm-x86/processor_32.h | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 3c159e4305a0..54e46414bf58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6be29b871e285d33be0e3025929e2d6bcabb0c0
+refs/heads/master: bdb4f156064e5f627213af82292eb8b5cf2dc5aa
diff --git a/trunk/arch/x86/kernel/process_32.c b/trunk/arch/x86/kernel/process_32.c
index 48e92e3758c2..40cc29695eba 100644
--- a/trunk/arch/x86/kernel/process_32.c
+++ b/trunk/arch/x86/kernel/process_32.c
@@ -588,7 +588,7 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
 }
 
 #ifdef CONFIG_SECCOMP
-void hard_disable_TSC(void)
+static void hard_disable_TSC(void)
 {
 	write_cr4(read_cr4() | X86_CR4_TSD);
 }
@@ -603,7 +603,7 @@ void disable_TSC(void)
 		hard_disable_TSC();
 	preempt_enable();
 }
-void hard_enable_TSC(void)
+static void hard_enable_TSC(void)
 {
 	write_cr4(read_cr4() & ~X86_CR4_TSD);
 }
diff --git a/trunk/include/asm-x86/processor_32.h b/trunk/include/asm-x86/processor_32.h
index e5056ab9dd9f..a5560a3b57ef 100644
--- a/trunk/include/asm-x86/processor_32.h
+++ b/trunk/include/asm-x86/processor_32.h
@@ -206,9 +206,7 @@ extern int bootloader_type;
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
-extern void hard_disable_TSC(void);
 extern void disable_TSC(void);
-extern void hard_enable_TSC(void);
 
 /*
  * Size of io_bitmap.