From: Ingo Molnar <mingo@kernel.org>
Date: Sat, 22 Sep 2012 11:30:37 +0000 (+0200)
Subject: Merge branch 'x86/smap'
X-Git-Tag: next-20120926~34^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=31a28d2b8caa82a5bb1cb9e9b188687391c2a3a2;p=karo-tx-linux.git

Merge branch 'x86/smap'
---

31a28d2b8caa82a5bb1cb9e9b188687391c2a3a2
diff --cc arch/x86/kernel/cpu/common.c
index 532691b6c8fe,44aec5d4dfaf..683933f62462
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@@ -1114,9 -1139,12 +1140,10 @@@ void syscall_init(void
  
  	/* Flags to clear on syscall */
  	wrmsrl(MSR_SYSCALL_MASK,
- 	       X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);
+ 	       X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|
+ 	       X86_EFLAGS_IOPL|X86_EFLAGS_AC);
  }
  
 -unsigned long kernel_eflags;
 -
  /*
   * Copies of the original ist values from the tss are only accessed during
   * debugging, no special alignment required.