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/m68k | |
| parent | 6a9366db547e958e8c9bf8e1c13bcea6cb2bf393 (diff) | |
Merge with Linux 2.4.0-test6-pre4.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/atari/ataints.c | 4 | ||||
| -rw-r--r-- | arch/m68k/kernel/entry.S | 10 | ||||
| -rw-r--r-- | arch/m68k/kernel/ints.c | 4 | ||||
| -rw-r--r-- | arch/m68k/kernel/m68k_ksyms.c | 2 |
4 files changed, 7 insertions, 13 deletions
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index f47ff3a7a..f92c45f60 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c @@ -168,7 +168,7 @@ asmlinkage void IRQ_NAME(n); \ void atari_slow_irq_##n##_dummy (void) { \ __asm__ (__ALIGN_STR "\n" \ SYMBOL_NAME_STR(atari_slow_irq_) #n "_handler:\t" \ -" addql #1,"SYMBOL_NAME_STR(local_irq_count)"\n" \ +" addql #1,"SYMBOL_NAME_STR(irq_stat)"+8\n" /* local_irq_count */ \ SAVE_ALL_INT "\n" \ GET_CURRENT(%%d0) "\n" \ " andb #~(1<<(%c3&7)),%a4:w\n" /* mask this interrupt */ \ @@ -274,7 +274,7 @@ __asm__ (__ALIGN_STR "\n" SYMBOL_NAME_STR(atari_fast_irq_handler) ": orw #0x700,%%sr /* disable all interrupts */ "SYMBOL_NAME_STR(atari_prio_irq_handler) ":\t - addql #1,"SYMBOL_NAME_STR(local_irq_count)"\n" + addql #1,"SYMBOL_NAME_STR(irq_stat)"+8\n" /* local_irq_count */ SAVE_ALL_INT "\n" GET_CURRENT(%%d0) " /* get vector number from stack frame and convert to source */ diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 5f08ef216..7cbb69d03 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S @@ -171,7 +171,7 @@ do_delayed_trace: #if 0 #if CONFIG_AMIGA SYMBOL_NAME_LABEL(ami_inthandler) - addql #1,SYMBOL_NAME(local_irq_count) + addql #1,SYMBOL_NAME(irq_stat)+8 | local_irq_count SAVE_ALL_INT GET_CURRENT(%d0) @@ -203,7 +203,7 @@ ENTRY(nmi_handler) SYMBOL_NAME_LABEL(inthandler) SAVE_ALL_INT GET_CURRENT(%d0) - addql #1,SYMBOL_NAME(local_irq_count) + addql #1,SYMBOL_NAME(irq_stat)+8 | local_irq_count | put exception # in d0 bfextu %sp@(PT_VECTOR){#4,#10},%d0 @@ -222,7 +222,7 @@ SYMBOL_NAME_LABEL(inthandler) 3: addql #8,%sp | pop parameters off stack SYMBOL_NAME_LABEL(ret_from_interrupt) - subql #1,SYMBOL_NAME(local_irq_count) + subql #1,SYMBOL_NAME(irq_stat)+8 | local_irq_count jeq 1f 2: RESTORE_ALL @@ -236,8 +236,8 @@ SYMBOL_NAME_LABEL(ret_from_interrupt) #endif /* check if we need to do software interrupts */ - movel SYMBOL_NAME(softirq_state),%d0 - andl SYMBOL_NAME(softirq_state)+4,%d0 + movel SYMBOL_NAME(irq_stat),%d0 | softirq_active + andl SYMBOL_NAME(irq_stat)+4,%d0 | softirq_mask jeq SYMBOL_NAME(ret_from_exception) pea SYMBOL_NAME(ret_from_exception) diff --git a/arch/m68k/kernel/ints.c b/arch/m68k/kernel/ints.c index 9dc6427e6..74e1e4c1e 100644 --- a/arch/m68k/kernel/ints.c +++ b/arch/m68k/kernel/ints.c @@ -57,10 +57,6 @@ volatile unsigned int num_spurious; #define NUM_IRQ_NODES 100 static irq_node_t nodes[NUM_IRQ_NODES]; -unsigned int local_irq_count[NR_CPUS]; - -unsigned int local_bh_count[NR_CPUS]; - static void dummy_enable_irq(unsigned int irq); static void dummy_disable_irq(unsigned int irq); static int dummy_request_irq(unsigned int irq, diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c index 6f8300422..7bf46149f 100644 --- a/arch/m68k/kernel/m68k_ksyms.c +++ b/arch/m68k/kernel/m68k_ksyms.c @@ -52,8 +52,6 @@ EXPORT_SYMBOL(dump_thread); EXPORT_SYMBOL(strnlen); EXPORT_SYMBOL(strrchr); EXPORT_SYMBOL(strstr); -EXPORT_SYMBOL(local_irq_count); -EXPORT_SYMBOL(local_bh_count); EXPORT_SYMBOL(enable_irq); EXPORT_SYMBOL(disable_irq); EXPORT_SYMBOL(kernel_thread); |