diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-02-08 11:22:00 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2011-02-19 06:58:20 -0500 |
commit | 2bdd10558c8d93009cb6c32ce9e30800fbb08add (patch) | |
tree | f25b36c02faa8709628e2dbb93748f370678bb52 /include/linux/irq.h | |
parent | bce43032ad79fae0ce5b6174ce1321e643ceb54b (diff) |
genirq: Move IRQ_AFFINITY_SET to core
Keep status in sync until last abuser is gone.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/linux/irq.h')
-rw-r--r-- | include/linux/irq.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index d5312e6fe1aa..8da1782ecfca 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -60,6 +60,7 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, | |||
60 | #define IRQ_MASKED 0x00002000 /* DEPRECATED */ | 60 | #define IRQ_MASKED 0x00002000 /* DEPRECATED */ |
61 | /* DEPRECATED use irq_setaffinity_pending() instead*/ | 61 | /* DEPRECATED use irq_setaffinity_pending() instead*/ |
62 | #define IRQ_MOVE_PENDING 0x00004000 | 62 | #define IRQ_MOVE_PENDING 0x00004000 |
63 | #define IRQ_AFFINITY_SET 0x02000000 /* DEPRECATED */ | ||
63 | #endif | 64 | #endif |
64 | 65 | ||
65 | #define IRQ_LEVEL 0x00008000 /* IRQ level triggered */ | 66 | #define IRQ_LEVEL 0x00008000 /* IRQ level triggered */ |
@@ -70,7 +71,6 @@ typedef void (*irq_flow_handler_t)(unsigned int irq, | |||
70 | #define IRQ_WAKEUP 0x00100000 /* IRQ triggers system wakeup */ | 71 | #define IRQ_WAKEUP 0x00100000 /* IRQ triggers system wakeup */ |
71 | #define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */ | 72 | #define IRQ_NO_BALANCING 0x00400000 /* IRQ is excluded from balancing */ |
72 | #define IRQ_MOVE_PCNTXT 0x01000000 /* IRQ migration from process context */ | 73 | #define IRQ_MOVE_PCNTXT 0x01000000 /* IRQ migration from process context */ |
73 | #define IRQ_AFFINITY_SET 0x02000000 /* IRQ affinity was set from userspace*/ | ||
74 | #define IRQ_NESTED_THREAD 0x10000000 /* IRQ is nested into another, no own handler thread */ | 74 | #define IRQ_NESTED_THREAD 0x10000000 /* IRQ is nested into another, no own handler thread */ |
75 | 75 | ||
76 | #define IRQF_MODIFY_MASK \ | 76 | #define IRQF_MODIFY_MASK \ |
@@ -134,12 +134,14 @@ struct irq_data { | |||
134 | * IRQD_SETAFFINITY_PENDING - Affinity setting is pending | 134 | * IRQD_SETAFFINITY_PENDING - Affinity setting is pending |
135 | * IRQD_NO_BALANCING - Balancing disabled for this IRQ | 135 | * IRQD_NO_BALANCING - Balancing disabled for this IRQ |
136 | * IRQD_PER_CPU - Interrupt is per cpu | 136 | * IRQD_PER_CPU - Interrupt is per cpu |
137 | * IRQD_AFFINITY_SET - Interrupt affinity was set | ||
137 | */ | 138 | */ |
138 | enum { | 139 | enum { |
139 | /* Bit 0 - 7 reserved for TYPE will use later */ | 140 | /* Bit 0 - 7 reserved for TYPE will use later */ |
140 | IRQD_SETAFFINITY_PENDING = (1 << 8), | 141 | IRQD_SETAFFINITY_PENDING = (1 << 8), |
141 | IRQD_NO_BALANCING = (1 << 10), | 142 | IRQD_NO_BALANCING = (1 << 10), |
142 | IRQD_PER_CPU = (1 << 11), | 143 | IRQD_PER_CPU = (1 << 11), |
144 | IRQD_AFFINITY_SET = (1 << 12), | ||
143 | }; | 145 | }; |
144 | 146 | ||
145 | static inline bool irqd_is_setaffinity_pending(struct irq_data *d) | 147 | static inline bool irqd_is_setaffinity_pending(struct irq_data *d) |
@@ -157,6 +159,11 @@ static inline bool irqd_can_balance(struct irq_data *d) | |||
157 | return !(d->state_use_accessors & (IRQD_PER_CPU | IRQD_NO_BALANCING)); | 159 | return !(d->state_use_accessors & (IRQD_PER_CPU | IRQD_NO_BALANCING)); |
158 | } | 160 | } |
159 | 161 | ||
162 | static inline bool irqd_affinity_was_set(struct irq_data *d) | ||
163 | { | ||
164 | return d->state_use_accessors & IRQD_AFFINITY_SET; | ||
165 | } | ||
166 | |||
160 | /** | 167 | /** |
161 | * struct irq_chip - hardware interrupt chip descriptor | 168 | * struct irq_chip - hardware interrupt chip descriptor |
162 | * | 169 | * |