diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 12:41:25 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 12:41:25 -0500 |
| commit | d5d74efbeac61c73431e8ef032e97d2d1004ce88 (patch) | |
| tree | 7ad8a86b8d203ef566cb89656bf394a8dcd7edd3 /arch/powerpc/kernel | |
| parent | fc7e13104f823d1ea9c1f4dd7531c14b0c1e6e7e (diff) | |
| parent | 5a1244e9ddb77eafb1de69a1be14e06ca04e733a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index 2d22bf03484e..bce33a38399f 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S | |||
| @@ -183,8 +183,8 @@ syscall_exit_trace_cont: | |||
| 183 | ld r13,GPR13(r1) /* returning to usermode */ | 183 | ld r13,GPR13(r1) /* returning to usermode */ |
| 184 | 1: ld r2,GPR2(r1) | 184 | 1: ld r2,GPR2(r1) |
| 185 | li r12,MSR_RI | 185 | li r12,MSR_RI |
| 186 | andc r10,r10,r12 | 186 | andc r11,r10,r12 |
| 187 | mtmsrd r10,1 /* clear MSR.RI */ | 187 | mtmsrd r11,1 /* clear MSR.RI */ |
| 188 | ld r1,GPR1(r1) | 188 | ld r1,GPR1(r1) |
| 189 | mtlr r4 | 189 | mtlr r4 |
| 190 | mtcr r5 | 190 | mtcr r5 |