aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2008-01-30 07:31:21 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:31:21 -0500
commitbdb4f156064e5f627213af82292eb8b5cf2dc5aa (patch)
treec338a58634623bb25a69db99733938b260633c3a
parentd6be29b871e285d33be0e3025929e2d6bcabb0c0 (diff)
i386: hard_{en,dis}able_TSC can be static
Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/process_32.c4
-rw-r--r--include/asm-x86/processor_32.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 48e92e3758c2..40cc29695eba 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -588,7 +588,7 @@ int dump_task_regs(struct task_struct *tsk, elf_gregset_t *regs)
588} 588}
589 589
590#ifdef CONFIG_SECCOMP 590#ifdef CONFIG_SECCOMP
591void hard_disable_TSC(void) 591static void hard_disable_TSC(void)
592{ 592{
593 write_cr4(read_cr4() | X86_CR4_TSD); 593 write_cr4(read_cr4() | X86_CR4_TSD);
594} 594}
@@ -603,7 +603,7 @@ void disable_TSC(void)
603 hard_disable_TSC(); 603 hard_disable_TSC();
604 preempt_enable(); 604 preempt_enable();
605} 605}
606void hard_enable_TSC(void) 606static void hard_enable_TSC(void)
607{ 607{
608 write_cr4(read_cr4() & ~X86_CR4_TSD); 608 write_cr4(read_cr4() & ~X86_CR4_TSD);
609} 609}
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index e5056ab9dd9f..a5560a3b57ef 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -206,9 +206,7 @@ extern int bootloader_type;
206 206
207#define HAVE_ARCH_PICK_MMAP_LAYOUT 207#define HAVE_ARCH_PICK_MMAP_LAYOUT
208 208
209extern void hard_disable_TSC(void);
210extern void disable_TSC(void); 209extern void disable_TSC(void);
211extern void hard_enable_TSC(void);
212 210
213/* 211/*
214 * Size of io_bitmap. 212 * Size of io_bitmap.