Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / include / asm-s390 / hardirq.h

diff --git a/include/asm-s390/hardirq.h b/include/asm-s390/hardirq.h
index 05670c2..c2f6a87 100644 (file)
--- a/include/asm-s390/hardirq.h
+++ b/include/asm-s390/hardirq.h
@@ -12,10 +12,10 @@
 #ifndef __ASM_HARDIRQ_H
 #define __ASM_HARDIRQ_H
 
-#include <linux/config.h>
 #include <linux/threads.h>
 #include <linux/sched.h>
 #include <linux/cache.h>
+#include <linux/interrupt.h>
 #include <asm/lowcore.h>
 
 /* irq_cpustat_t is unused currently, but could be converted
@@ -27,34 +27,11 @@ typedef struct {
 
 #define local_softirq_pending() (S390_lowcore.softirq_pending)
 
-/* this is always called with cpu == smp_processor_id() at the moment */
-static inline __u32
-softirq_pending(unsigned int cpu)
-{
-       if (cpu == smp_processor_id())
-               return local_softirq_pending();
-       return lowcore_ptr[cpu]->softirq_pending;
-}
-
 #define __ARCH_IRQ_STAT
+#define __ARCH_HAS_DO_SOFTIRQ
 
 #define HARDIRQ_BITS   8
 
-extern void account_ticks(struct pt_regs *);
-
-#define __ARCH_HAS_DO_SOFTIRQ
-
-#define irq_enter()                                                    \
-do {                                                                   \
-       (preempt_count() += HARDIRQ_OFFSET);                            \
-} while(0)
-#define irq_exit()                                                     \
-do {                                                                   \
-       preempt_count() -= IRQ_EXIT_OFFSET;                             \
-       if (!in_interrupt() && local_softirq_pending())                 \
-               /* Use the async. stack for softirq */                  \
-               do_softirq();                                           \
-       preempt_enable_no_resched();                                    \
-} while (0)
+extern void account_ticks(void);
 
 #endif /* __ASM_HARDIRQ_H */