From 7775916ff14a5d52a2867e722c5d152a33671e5c Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Sat, 16 Apr 2005 15:25:05 -0700
Subject: [PATCH] --- yaml --- r: 85 b: refs/heads/master c:
 dc37db4d8cb376bb67c6357c50d707ced3d71c39 h: refs/heads/master i:   83:
 18fa0a21113d6f0ee68aafb797c7848120e0f70c v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/entry.S | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f33e3536028d..b72fd17b47b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cdd219cd1f9e657aead247dfa1ecfdeb37efdf70
+refs/heads/master: dc37db4d8cb376bb67c6357c50d707ced3d71c39
diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S
index 887c5f017d28..3233a15cc4e0 100644
--- a/trunk/arch/x86_64/kernel/entry.S
+++ b/trunk/arch/x86_64/kernel/entry.S
@@ -44,10 +44,7 @@
 
 	.code64
 
-#ifdef CONFIG_PREEMPT
-#define preempt_stop cli
-#else
-#define preempt_stop
+#ifndef CONFIG_PREEMPT
 #define retint_kernel retint_restore_args
 #endif