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