diff options
Diffstat (limited to 'include/linux/interrupt.h')
-rw-r--r-- | include/linux/interrupt.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 0a90205184b0..2c08fdc2bdf7 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <linux/preempt.h> | 9 | #include <linux/preempt.h> |
10 | #include <linux/cpumask.h> | 10 | #include <linux/cpumask.h> |
11 | #include <linux/hardirq.h> | 11 | #include <linux/hardirq.h> |
12 | #include <linux/sched.h> | ||
12 | #include <asm/atomic.h> | 13 | #include <asm/atomic.h> |
13 | #include <asm/ptrace.h> | 14 | #include <asm/ptrace.h> |
14 | #include <asm/system.h> | 15 | #include <asm/system.h> |
@@ -78,7 +79,7 @@ static inline void __deprecated save_flags(unsigned long *x) | |||
78 | { | 79 | { |
79 | local_save_flags(*x); | 80 | local_save_flags(*x); |
80 | } | 81 | } |
81 | #define save_flags(x) save_flags(&x); | 82 | #define save_flags(x) save_flags(&x) |
82 | static inline void __deprecated restore_flags(unsigned long x) | 83 | static inline void __deprecated restore_flags(unsigned long x) |
83 | { | 84 | { |
84 | local_irq_restore(x); | 85 | local_irq_restore(x); |
@@ -111,7 +112,7 @@ enum | |||
111 | TIMER_SOFTIRQ, | 112 | TIMER_SOFTIRQ, |
112 | NET_TX_SOFTIRQ, | 113 | NET_TX_SOFTIRQ, |
113 | NET_RX_SOFTIRQ, | 114 | NET_RX_SOFTIRQ, |
114 | SCSI_SOFTIRQ, | 115 | BLOCK_SOFTIRQ, |
115 | TASKLET_SOFTIRQ | 116 | TASKLET_SOFTIRQ |
116 | }; | 117 | }; |
117 | 118 | ||