diff options
| author | Geert Uytterhoeven <geert@linux-m68k.org> | 2002-12-27 19:11:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-12-27 19:11:31 -0800 |
| commit | ec0d2ffe56b4ed3ee35765b3855e45e57c764272 (patch) | |
| tree | 6215819478dbde83623206286bc45b72fda7c0b9 | |
| parent | 43b1487f08e821dbcc9411aaa7ee9539c03450ee (diff) | |
[PATCH] M68k local_irq_count update
M68k: local_irq_count was moved to the hardirq bitmask of preempt_count() (cfr.
asm/hardirq.h).
| -rw-r--r-- | arch/m68k/atari/ataints.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index 8fc840c0bafc..71ce56eb7ad6 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" \ "atari_slow_irq_" #n "_handler:\t" \ -" addql #1,%5\n" /* local_irq_count++ */ \ +" addl %6,%5\n" /* preempt_count() += HARDIRQ_OFFSET */ \ SAVE_ALL_INT "\n" \ GET_CURRENT(%%d0) "\n" \ " andb #~(1<<(%c3&7)),%a4:w\n" /* mask this interrupt */ \ @@ -194,7 +194,7 @@ __asm__ (__ALIGN_STR "\n" \ "n" (PT_OFF_SR), "n" (n), \ "i" (n & 8 ? (n & 16 ? &tt_mfp.int_mk_a : &mfp.int_mk_a) \ : (n & 16 ? &tt_mfp.int_mk_b : &mfp.int_mk_b)), \ - "m" (local_irq_count(0)) \ + "m" (preempt_count()), "di" (HARDIRQ_OFFSET) \ ); \ for (;;); /* fake noreturn */ \ } @@ -276,7 +276,7 @@ __asm__ (__ALIGN_STR "\n" "atari_fast_irq_handler: orw #0x700,%%sr /* disable all interrupts */ atari_prio_irq_handler:\t - addql #1,%2\n" /* local_irq_count++ */ + addl %3,%2\n" /* preempt_count() += HARDIRQ_OFFSET */ SAVE_ALL_INT "\n" GET_CURRENT(%%d0) " /* get vector number from stack frame and convert to source */ @@ -297,7 +297,7 @@ atari_prio_irq_handler:\t addql #4,%%sp jbra ret_from_interrupt" : : "i" (&kstat_cpu(0).irqs), "n" (PT_OFF_FORMATVEC), - "m" (local_irq_count(0)) + "m" (preempt_count()), "di" (HARDIRQ_OFFSET) ); for (;;); } |