diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 23:14:02 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 23:14:02 +0100 |
| commit | 9aef3b7c208b216b54a2e6614c6287ca8a09cf6f (patch) | |
| tree | 0d6b41a55c4e6a4dd1135d76aeb8b12c7b9841bb /arch/ia64/kernel/mca_asm.S | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6 (diff) | |
| parent | [IA64-SGI] Add PROM feature set for device flush list (diff) | |
| download | linux-9aef3b7c208b216b54a2e6614c6287ca8a09cf6f.tar.xz linux-9aef3b7c208b216b54a2e6614c6287ca8a09cf6f.zip | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel/mca_asm.S')
| -rw-r--r-- | arch/ia64/kernel/mca_asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S index 403a80a58c13..60a464bfd9e2 100644 --- a/arch/ia64/kernel/mca_asm.S +++ b/arch/ia64/kernel/mca_asm.S @@ -512,7 +512,7 @@ ia64_state_save: st8 [temp1]=r12 // os_status, default is cold boot mov r6=IA64_MCA_SAME_CONTEXT ;; - st8 [temp1]=r6 // context, default is same context + st8 [temp2]=r6 // context, default is same context // Save the pt_regs data that is not in minstate. The previous code // left regs at sos. |