diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 18:54:49 +0000 |
| commit | 5514f4babeeb3af00ee0c325e3cda7a562cc3d65 (patch) | |
| tree | edd733879cab73e41324a99ca5da7bc154c4196d /arch/ia64/kernel/entry.S | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'arch/ia64/kernel/entry.S')
| -rw-r--r-- | arch/ia64/kernel/entry.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S index 3aadb43a0..f9beac21d 100644 --- a/arch/ia64/kernel/entry.S +++ b/arch/ia64/kernel/entry.S @@ -506,7 +506,7 @@ GLOBAL_ENTRY(ia64_leave_kernel) PT_REGS_UNWIND_INFO(0) #ifdef CONFIG_SMP adds r2=IA64_TASK_PROCESSOR_OFFSET,r13 - movl r3=softirq_state + movl r3=irq_stat // softirq_active ;; ld4 r2=[r2] ;; @@ -514,10 +514,10 @@ GLOBAL_ENTRY(ia64_leave_kernel) ;; add r3=r2,r3 #else - movl r3=softirq_state + movl r3=irq_stat // softirq_active #endif ;; - ld8 r2=[r3] // r3 is guaranteed to be 8-byte aligned! + ld8 r2=[r3] // r3 (softirq_active+softirq_mask) is guaranteed to be 8-byte aligned! ;; shr r3=r2,32 ;; |