From ed858400c42fbb3d0e07084764ac9e7a2f8b49f2 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 30 Jan 2008 13:30:57 +0100
Subject: [PATCH] --- yaml --- r: 79898 b: refs/heads/master c:
 a46ff73d53f011de1dfc1983b05db2c04d193713 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/setup64.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 77a7e3c6c8c2..031665d943ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 742fa54a62be6a263df14a553bf832724471dfbe
+refs/heads/master: a46ff73d53f011de1dfc1983b05db2c04d193713
diff --git a/trunk/arch/x86/kernel/setup64.c b/trunk/arch/x86/kernel/setup64.c
index 3558ac78c926..51297cca6b42 100644
--- a/trunk/arch/x86/kernel/setup64.c
+++ b/trunk/arch/x86/kernel/setup64.c
@@ -169,7 +169,8 @@ void syscall_init(void)
 #endif
 
 	/* Flags to clear on syscall */
-	wrmsrl(MSR_SYSCALL_MASK, EF_TF|EF_DF|EF_IE|0x3000); 
+	wrmsrl(MSR_SYSCALL_MASK,
+	       X86_EFLAGS_TF|X86_EFLAGS_DF|X86_EFLAGS_IF|X86_EFLAGS_IOPL);
 }
 
 void __cpuinit check_efer(void)