patch-2.4.0-test6 linux/include/asm-s390/hardirq.h

• Lines: 73
• Date: Fri Aug 4 16:15:37 2000
• Orig file: v2.4.0-test5/linux/include/asm-s390/hardirq.h
• Orig date: Fri May 12 14:18:56 2000

diff -u --recursive --new-file v2.4.0-test5/linux/include/asm-s390/hardirq.h linux/include/asm-s390/hardirq.h
@@ -16,21 +16,50 @@
 #include <linux/threads.h>
 #include <asm/lowcore.h>
 #include <linux/sched.h>
+
+/* No irq_cpustat_t for s390, the data is held directly in S390_lowcore */
+
+/*
+ * Simple wrappers reducing source bloat.  S390 specific because each
+ * cpu stores its data in S390_lowcore (PSA) instead of using a cache
+ * aligned array element like most architectures.
+ */
+
+#ifdef CONFIG_SMP
+
+#define softirq_active(cpu)	(safe_get_cpu_lowcore(cpu).__softirq_active)
+#define softirq_mask(cpu)	(safe_get_cpu_lowcore(cpu).__softirq_mask)
+#define local_irq_count(cpu)	(safe_get_cpu_lowcore(cpu).__local_irq_count)
+#define local_bh_count(cpu)	(safe_get_cpu_lowcore(cpu).__local_bh_count)
+#define syscall_count(cpu)	(safe_get_cpu_lowcore(cpu).__syscall_count)
+
+#else	/* CONFIG_SMP */
+
+/* Optimize away the cpu calculation, it is always current PSA */
+#define softirq_active(cpu)	((void)(cpu), S390_lowcore.__softirq_active)
+#define softirq_mask(cpu)	((void)(cpu), S390_lowcore.__softirq_mask)
+#define local_irq_count(cpu)	((void)(cpu), S390_lowcore.__local_irq_count)
+#define local_bh_count(cpu)	((void)(cpu), S390_lowcore.__local_bh_count)
+#define syscall_count(cpu)	((void)(cpu), S390_lowcore.__syscall_count)
+
+#endif	/* CONFIG_SMP */
+
 /*
  * Are we in an interrupt context? Either doing bottom half
  * or hardware interrupt processing?
+ * Special definitions for s390, always access current PSA.
  */
-#define in_interrupt() ((atomic_read(&S390_lowcore.local_irq_count) + atomic_read(&S390_lowcore.local_bh_count)) != 0)
+#define in_interrupt() ((S390_lowcore.__local_irq_count + S390_lowcore.__local_bh_count) != 0)
 
-#define in_irq() (atomic_read(&S390_lowcore.local_irq_count) != 0)
+#define in_irq() (S390_lowcore.__local_irq_count != 0)
 
 #ifndef CONFIG_SMP
 
-#define hardirq_trylock(cpu)	(atomic_read(&S390_lowcore.local_irq_count) == 0)
+#define hardirq_trylock(cpu)	(local_irq_count(cpu) == 0)
 #define hardirq_endlock(cpu)	do { } while (0)
 
-#define hardirq_enter(cpu)	(atomic_inc(&S390_lowcore.local_irq_count))
-#define hardirq_exit(cpu)	(atomic_dec(&S390_lowcore.local_irq_count))
+#define hardirq_enter(cpu)	(local_irq_count(cpu)++)
+#define hardirq_exit(cpu)	(local_irq_count(cpu)--)
 
 #define synchronize_irq()	do { } while (0)
 
@@ -54,14 +83,14 @@
 
 static inline void hardirq_enter(int cpu)
 {
-        atomic_inc(&safe_get_cpu_lowcore(cpu).local_irq_count);
+        ++local_irq_count(cpu);
 	atomic_inc(&global_irq_count);
 }
 
 static inline void hardirq_exit(int cpu)
 {
 	atomic_dec(&global_irq_count);
-        atomic_dec(&safe_get_cpu_lowcore(cpu).local_irq_count);
+        --local_irq_count(cpu);
 }
 
 static inline int hardirq_trylock(int cpu)