Merge branch 'x86-cache-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / x86 / kernel / process_32.c

diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index d0d7441085942fc5efe3fda3dd0c0c8fe9fdef69..a0ac3e81518ad8f633c4a3c16e17cabea38950e5 100644 (file)
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -53,6 +53,7 @@
 #include <asm/debugreg.h>
 #include <asm/switch_to.h>
 #include <asm/vm86.h>
+#include <asm/intel_rdt.h>
 
 void __show_regs(struct pt_regs *regs, int all)
 {
@@ -296,5 +297,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 
        this_cpu_write(current_task, next_p);
 
+       /* Load the Intel cache allocation PQR MSR. */
+       intel_rdt_sched_in();
+
        return prev_p;
 }