Merge branch 'sched/urgent' into sched/core, to pick up fixes before applying new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 6ad8a6396b75..a388bb883128 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -29,6 +29,7 @@
 #include <asm/fpu-internal.h>
 #include <asm/debugreg.h>
 #include <asm/nmi.h>
+#include <asm/tlbflush.h>
 
 /*
  * per-CPU TSS segments. Threads are completely 'soft' on Linux,
@@ -142,7 +143,7 @@ void flush_thread(void)
 
 static void hard_disable_TSC(void)
 {
-        write_cr4(read_cr4() | X86_CR4_TSD);
+        cr4_set_bits(X86_CR4_TSD);
 }
 
 void disable_TSC(void)
@@ -159,7 +160,7 @@ void disable_TSC(void)
 
 static void hard_enable_TSC(void)
 {
-        write_cr4(read_cr4() & ~X86_CR4_TSD);
+        cr4_clear_bits(X86_CR4_TSD);
 }
 
 static void enable_TSC(void)