[PATCH] x86_64: Fix a small missing schedule race
[linux-2.6.git] / arch / x86_64 / kernel / entry.S
index 3e888c2e5a06c77eb0a90ff45098eff62f078bf9..887c5f017d28694c8495769a4df04fddaac6389d 100644 (file)
@@ -284,6 +284,7 @@ int_careful:
        pushq %rdi
        call schedule
        popq %rdi
+       cli
        jmp int_with_check
 
        /* handle signals and tracing -- both require a full stack frame */
@@ -453,7 +454,6 @@ retint_check:
        andl %edi,%edx
        jnz  retint_careful
 retint_swapgs:         
-       cli
        swapgs 
 retint_restore_args:                           
        cli