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/i386/kernel/entry.S | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'arch/i386/kernel/entry.S')
| -rw-r--r-- | arch/i386/kernel/entry.S | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S index da7fd047d..c36d01cce 100644 --- a/arch/i386/kernel/entry.S +++ b/arch/i386/kernel/entry.S @@ -206,11 +206,11 @@ ENTRY(ret_from_sys_call) #ifdef CONFIG_SMP movl processor(%ebx),%eax shll $5,%eax - movl SYMBOL_NAME(softirq_state)(,%eax),%ecx - testl SYMBOL_NAME(softirq_state)+4(,%eax),%ecx + movl SYMBOL_NAME(irq_stat)(,%eax),%ecx # softirq_active + testl SYMBOL_NAME(irq_stat)+4(,%eax),%ecx # softirq_mask #else - movl SYMBOL_NAME(softirq_state),%ecx - testl SYMBOL_NAME(softirq_state)+4,%ecx + movl SYMBOL_NAME(irq_stat),%ecx # softirq_active + testl SYMBOL_NAME(irq_stat)+4,%ecx # softirq_mask #endif jne handle_softirq @@ -262,11 +262,11 @@ ret_from_exception: GET_CURRENT(%ebx) movl processor(%ebx),%eax shll $5,%eax - movl SYMBOL_NAME(softirq_state)(,%eax),%ecx - testl SYMBOL_NAME(softirq_state)+4(,%eax),%ecx + movl SYMBOL_NAME(irq_stat)(,%eax),%ecx # softirq_active + testl SYMBOL_NAME(irq_stat)+4(,%eax),%ecx # softirq_mask #else - movl SYMBOL_NAME(softirq_state),%ecx - testl SYMBOL_NAME(softirq_state)+4,%ecx + movl SYMBOL_NAME(irq_stat),%ecx # softirq_active + testl SYMBOL_NAME(irq_stat)+4,%ecx # softirq_mask #endif jne handle_softirq |