patch-2.4.0-test6 linux/arch/s390/kernel/entry.S

• Lines: 56
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/arch/s390/kernel/entry.S
• Orig date: Fri May 12 14:18:55 2000

diff -u --recursive --new-file v2.4.0-test5/linux/arch/s390/kernel/entry.S linux/arch/s390/kernel/entry.S
@@ -193,7 +193,6 @@
  */
 
 sysc_lit:
-  sysc_softirq_state: .long  softirq_state
   sysc_do_signal:     .long  do_signal
   sysc_do_softirq:    .long  do_softirq
   sysc_schedule:      .long  schedule
@@ -237,17 +236,8 @@
 #
 # check, if bottom-half has to be done
 #
-#ifdef CONFIG_SMP
-        l       %r1,processor(%r9) # get processor index
-        sll     %r1,5
-        al      %r1,sysc_softirq_state-sysc_lit(%r13)
-        l       %r0,0(%r1)        # get softirq_state[cpu].active
-        n       %r0,4(%r1)        # and it with softirq_state[cpu].mask
-#else
-        l       %r1,sysc_softirq_state-sysc_lit(%r13)
-        l       %r0,0(%r1)        # get softirq_state.active
-        n       %r0,4(%r1)        # and it with softirq_state.mask
-#endif
+        l       %r0,__LC_IRQ_STAT     # get softirq_active
+        n       %r0,__LC_IRQ_STAT+4   # and it with softirq_mask
         jnz     sysc_handle_bottom_half
 #
 # check, if reschedule is needed
@@ -714,7 +704,6 @@
   io_do_IRQ:        .long do_IRQ
   io_schedule:	    .long schedule
   io_do_signal:     .long do_signal
-  io_softirq_state: .long  softirq_state
   io_do_softirq:    .long  do_softirq
 
         .globl io_int_handler
@@ -737,17 +726,8 @@
 #
 # check, if bottom-half has to be done
 #
-#ifdef CONFIG_SMP
-        l       %r1,processor(%r9) # get processor index
-        sll     %r1,5
-        al      %r1,io_softirq_state-io_lit(%r13)
-        l       %r0,0(%r1)        # get softirq_state[cpu].active
-        n       %r0,4(%r1)        # and it with softirq_state[cpu].mask
-#else
-        l       %r1,io_softirq_state-io_lit(%r13)
-        l       %r0,0(%r1)        # get softirq_state.active
-        n       %r0,4(%r1)        # and it with softirq_state.mask
-#endif
+        l       %r0,__LC_IRQ_STAT     # get softirq_active
+        n       %r0,__LC_IRQ_STAT+4   # and it with softirq_mask
         jnz     io_handle_bottom_half
 io_return_bh:	
 #