diff options
| author |   Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 09:41:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-20 09:41:25 -0800 |
| commit | d5d74efbeac61c73431e8ef032e97d2d1004ce88 (patch) | |
| tree | 7ad8a86b8d203ef566cb89656bf394a8dcd7edd3 /arch/powerpc/kernel | |
| parent | Merge branch 'fixes' of git://git.linux-nfs.org/pub/linux/nfs-2.6 (diff) | |
| parent | powerpc: update defconfigs (diff) | |
| download | linux-dev-d5d74efbeac61c73431e8ef032e97d2d1004ce88.tar.xz linux-dev-d5d74efbeac61c73431e8ef032e97d2d1004ce88.zip | |
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: ld r13,GPR13(r1) /* returning to usermode */ 1: ld r2,GPR2(r1) li r12,MSR_RI - andc r10,r10,r12 - mtmsrd r10,1 /* clear MSR.RI */ + andc r11,r10,r12 + mtmsrd r11,1 /* clear MSR.RI */ ld r1,GPR1(r1) mtlr r4 mtcr r5 |