diff options
| author | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-18 02:56:30 -0400 |
| commit | 1e42198609d73ed1a9adcba2af275c24c2678420 (patch) | |
| tree | 32fd4d9073bfc0f3909af8f9fb4bcff38951d01a /arch/frv/kernel/switch_to.S | |
| parent | 794eb6bf20ebf992c040ea831cd3a9c64b0c1f7a (diff) | |
| parent | 4b119e21d0c66c22e8ca03df05d9de623d0eb50f (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/frv/kernel/switch_to.S')
| -rw-r--r-- | arch/frv/kernel/switch_to.S | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/frv/kernel/switch_to.S b/arch/frv/kernel/switch_to.S index b5275fa9cd0d..b06668670fcc 100644 --- a/arch/frv/kernel/switch_to.S +++ b/arch/frv/kernel/switch_to.S | |||
| @@ -102,13 +102,6 @@ __switch_to: | |||
| 102 | movgs gr14,lr | 102 | movgs gr14,lr |
| 103 | bar | 103 | bar |
| 104 | 104 | ||
| 105 | srli gr15,#28,gr5 | ||
| 106 | subicc gr5,#0xc,gr0,icc0 | ||
| 107 | beq icc0,#0,111f | ||
| 108 | break | ||
| 109 | nop | ||
| 110 | 111: | ||
| 111 | |||
| 112 | # jump to __switch_back or ret_from_fork as appropriate | 105 | # jump to __switch_back or ret_from_fork as appropriate |
| 113 | # - move prev to GR8 | 106 | # - move prev to GR8 |
| 114 | movgs gr4,psr | 107 | movgs gr4,psr |