Merge with Linux 2.4.0-test6-pre4.

1 files changed, 7 insertions, 7 deletions

diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 298aa2482..ba513325a 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -143,9 +143,9 @@ static void show(char * str)
 
 	printk("\n%s, CPU %d:\n", str, cpu);
 	printk("irq:  %d [%d]\n",
-	       atomic_read(&global_irq_count),atomic_read(&S390_lowcore.local_irq_count));
+	       atomic_read(&global_irq_count),local_irq_count(smp_processor_id()));
 	printk("bh:   %d [%d]\n",
-	       atomic_read(&global_bh_count),atomic_read(&S390_lowcore.local_bh_count));
+	       atomic_read(&global_bh_count),local_bh_count(smp_processor_id()));
 	stack = (unsigned long *) &str;
 	for (i = 40; i ; i--) {
 		unsigned long x = *++stack;
@@ -181,7 +181,7 @@ static inline void wait_on_irq(int cpu)
 		 * already executing in one..
 		 */
 		if (!atomic_read(&global_irq_count)) {
-			if (atomic_read(&safe_get_cpu_lowcore(cpu).local_bh_count)||
+			if (local_bh_count(cpu)||
 			    !atomic_read(&global_bh_count))
 				break;
 		}
@@ -202,7 +202,7 @@ static inline void wait_on_irq(int cpu)
 				continue;
 			if (atomic_read(&global_irq_lock))
 				continue;
-			if (!(atomic_read(&safe_get_cpu_lowcore(cpu).local_bh_count))
+			if (!local_bh_count(cpu)
 			    && atomic_read(&global_bh_count))
 				continue;
 			if (!test_and_set_bit(0,&global_irq_lock))
@@ -288,7 +288,7 @@ void __global_cli(void)
 	if (flags & (1 << EFLAGS_I_SHIFT)) {
 		int cpu = smp_processor_id();
 		__cli();
-		if (!atomic_read(&S390_lowcore.local_irq_count))
+		if (!in_irq())
 			get_irqlock(cpu);
 	}
 }
@@ -296,7 +296,7 @@ void __global_cli(void)
 void __global_sti(void)
 {
 
-	if (!atomic_read(&S390_lowcore.local_irq_count))
+	if (!in_irq())
 		release_irqlock(smp_processor_id());
 	__sti();
 }
@@ -320,7 +320,7 @@ unsigned long __global_save_flags(void)
 	retval = 2 + local_enabled;
 
 	/* check for global flags if we're not in an interrupt */
-	if (!atomic_read(&S390_lowcore.local_irq_count))
+	if (!in_irq())
 	{
 		if (local_enabled)
 			retval = 1;