diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:14:02 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 14:14:02 -0800 |
| commit | 9aef3b7c208b216b54a2e6614c6287ca8a09cf6f (patch) | |
| tree | 0d6b41a55c4e6a4dd1135d76aeb8b12c7b9841bb /arch/ia64/kernel | |
| parent | e0ae23550ffd3bfe319fa66879779be1a9a4a155 (diff) | |
| parent | 61d67f2e07d96d20d86135792ca591c491939c27 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
Diffstat (limited to 'arch/ia64/kernel')
| -rw-r--r-- | arch/ia64/kernel/mca_asm.S | 2 | ||||
| -rw-r--r-- | arch/ia64/kernel/unaligned.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S index 403a80a58c1..60a464bfd9e 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. diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c index 43b45b65ee5..f9e0ae936d1 100644 --- a/arch/ia64/kernel/unaligned.c +++ b/arch/ia64/kernel/unaligned.c @@ -1283,8 +1283,9 @@ within_logging_rate_limit (void) if (jiffies - last_time > 5*HZ) count = 0; - if (++count < 5) { + if (count < 5) { last_time = jiffies; + count++; return 1; } return 0; |