From c39259326e4396efa5319ee5ce0e0ee1d86a09f6 Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 23 Jun 2007 02:29:25 +0200
Subject: [PATCH] --- yaml --- r: 57967 b: refs/heads/master c:
 75154f402ef18e459ff97ddece25656b6c2b329c h: refs/heads/master i:   57965:
 dc5412b71e2183729b9de33b06d6dfa4705cf31b   57963:
 4c562bb12655b860fa871e634a707fa6c203d943   57959:
 bf06851b75c647125c883d9554cf85c90673473c   57951:
 5d4c6c18a6553b6cfa6390b5b58e6f0d11e03bc7 v: v3

---
 [refs]                             | 2 +-
 trunk/arch/x86_64/kernel/entry.S   | 7 +++++++
 trunk/arch/x86_64/kernel/setup64.c | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 487e881b73d9..d0d7fe093635 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e2f1f19272f8de0374ad297b9806f8b6509e0013
+refs/heads/master: 75154f402ef18e459ff97ddece25656b6c2b329c
diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S
index fa984b53e7e6..a67f87bf4015 100644
--- a/trunk/arch/x86_64/kernel/entry.S
+++ b/trunk/arch/x86_64/kernel/entry.S
@@ -1163,3 +1163,10 @@ ENTRY(call_softirq)
 	ret
 	CFI_ENDPROC
 ENDPROC(call_softirq)
+
+KPROBE_ENTRY(ignore_sysret)
+	CFI_STARTPROC
+	mov $-ENOSYS,%eax
+	sysret
+	CFI_ENDPROC
+ENDPROC(ignore_sysret)
diff --git a/trunk/arch/x86_64/kernel/setup64.c b/trunk/arch/x86_64/kernel/setup64.c
index 64379a80d763..1200aaac403e 100644
--- a/trunk/arch/x86_64/kernel/setup64.c
+++ b/trunk/arch/x86_64/kernel/setup64.c
@@ -150,6 +150,8 @@ void pda_init(int cpu)
 char boot_exception_stacks[(N_EXCEPTION_STACKS - 1) * EXCEPTION_STKSZ + DEBUG_STKSZ]
 __attribute__((section(".bss.page_aligned")));
 
+extern asmlinkage void ignore_sysret(void);
+
 /* May not be marked __init: used by software suspend */
 void syscall_init(void)
 {
@@ -160,6 +162,7 @@ void syscall_init(void)
 	 */ 
 	wrmsrl(MSR_STAR,  ((u64)__USER32_CS)<<48  | ((u64)__KERNEL_CS)<<32); 
 	wrmsrl(MSR_LSTAR, system_call); 
+	wrmsrl(MSR_CSTAR, ignore_sysret);
 
 #ifdef CONFIG_IA32_EMULATION   		
 	syscall32_cpu_init ();