Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen...

[sfrench/cifs-2.6.git] / arch / frv / kernel / switch_to.S

diff --git a/arch/frv/kernel/switch_to.S b/arch/frv/kernel/switch_to.S
index 9e5a583991a3ace7e1dcf74ada8ece2f1ef1264f..b06668670fcc5b79018793db30fd20e504e3fe1d 100644 (file)
--- a/arch/frv/kernel/switch_to.S
+++ b/arch/frv/kernel/switch_to.S
@@ -11,6 +11,7 @@
 # 2 of the License, or (at your option) any later version.
 #
 ###############################################################################
+
 #include <linux/linkage.h>
 #include <asm/thread_info.h>
 #include <asm/processor.h>
@@ -30,7 +31,7 @@
        # address of frame 0 (userspace) on current kernel stack
        .globl          __kernel_frame0_ptr
 __kernel_frame0_ptr:
-       .long           init_thread_union + THREAD_SIZE - USER_CONTEXT_SIZE
+       .long           init_thread_union + THREAD_SIZE - FRV_FRAME0_SIZE
 
        # address of current task
        .globl          __kernel_current_task
@@ -101,13 +102,6 @@ __switch_to:
        movgs           gr14,lr
        bar
 
-       srli            gr15,#28,gr5
-       subicc          gr5,#0xc,gr0,icc0
-       beq             icc0,#0,111f
-       break
-       nop
-111:
-
        # jump to __switch_back or ret_from_fork as appropriate
        # - move prev to GR8
        movgs           gr4,psr