diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 04:28:13 -0500 |
| commit | 99b3738fbf17208ac474420fa6b7e4b0c0c2b9ed (patch) | |
| tree | 6f977546112ccbd617ef40ae38a1ca558d71bce9 /arch/ia64/kernel/mca_asm.S | |
| parent | 332b5a52f2f96bc2d13bbe594a430318c0ee4425 (diff) | |
| parent | 8a19ac89edbe9b702c10fd2039b8cb2db4644a5f (diff) | |
Merge branch 'upstream'
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: | |||
| 512 | st8 [temp1]=r12 // os_status, default is cold boot | 512 | st8 [temp1]=r12 // os_status, default is cold boot |
| 513 | mov r6=IA64_MCA_SAME_CONTEXT | 513 | mov r6=IA64_MCA_SAME_CONTEXT |
| 514 | ;; | 514 | ;; |
| 515 | st8 [temp1]=r6 // context, default is same context | 515 | st8 [temp2]=r6 // context, default is same context |
| 516 | 516 | ||
| 517 | // Save the pt_regs data that is not in minstate. The previous code | 517 | // Save the pt_regs data that is not in minstate. The previous code |
| 518 | // left regs at sos. | 518 | // left regs at sos. |