genirq: Force wrapped access to desc->status in core code
Force the usage of wrappers by another nasty CPP substitution. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
1ccb4e612f
commit
f9e4989eb8
|
@ -55,7 +55,7 @@ irqreturn_t
|
|||
handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
|
||||
{
|
||||
irqreturn_t ret, retval = IRQ_NONE;
|
||||
unsigned int status = 0, irq = desc->irq_data.irq;
|
||||
unsigned int random = 0, irq = desc->irq_data.irq;
|
||||
|
||||
do {
|
||||
trace_irq_handler_entry(irq, action);
|
||||
|
@ -98,7 +98,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
|
|||
|
||||
/* Fall through to add to randomness */
|
||||
case IRQ_HANDLED:
|
||||
status |= action->flags;
|
||||
random |= action->flags;
|
||||
break;
|
||||
|
||||
default:
|
||||
|
@ -109,7 +109,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
|
|||
action = action->next;
|
||||
} while (action);
|
||||
|
||||
if (status & IRQF_SAMPLE_RANDOM)
|
||||
if (random & IRQF_SAMPLE_RANDOM)
|
||||
add_interrupt_randomness(irq);
|
||||
|
||||
if (!noirqdebug)
|
||||
|
|
|
@ -79,7 +79,7 @@ static void desc_set_defaults(unsigned int irq, struct irq_desc *desc, int node)
|
|||
desc->irq_data.chip_data = NULL;
|
||||
desc->irq_data.handler_data = NULL;
|
||||
desc->irq_data.msi_desc = NULL;
|
||||
desc->status = _IRQ_DEFAULT_INIT_FLAGS;
|
||||
irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS);
|
||||
desc->istate = IRQS_DISABLED;
|
||||
desc->handle_irq = handle_bad_irq;
|
||||
desc->depth = 1;
|
||||
|
@ -247,7 +247,6 @@ int __init early_irq_init(void)
|
|||
|
||||
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
|
||||
[0 ... NR_IRQS-1] = {
|
||||
.status = _IRQ_DEFAULT_INIT_FLAGS,
|
||||
.istate = IRQS_DISABLED,
|
||||
.handle_irq = handle_bad_irq,
|
||||
.depth = 1,
|
||||
|
@ -271,6 +270,7 @@ int __init early_irq_init(void)
|
|||
desc[i].irq_data.irq = i;
|
||||
desc[i].irq_data.chip = &no_irq_chip;
|
||||
desc[i].kstat_irqs = alloc_percpu(unsigned int);
|
||||
irq_settings_clr_and_set(desc, ~0, _IRQ_DEFAULT_INIT_FLAGS);
|
||||
alloc_masks(desc + i, GFP_KERNEL, node);
|
||||
desc_smp_init(desc + i, node);
|
||||
lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);
|
||||
|
|
|
@ -148,3 +148,6 @@ static inline bool irq_settings_is_nested_thread(struct irq_desc *desc)
|
|||
{
|
||||
return desc->status & _IRQ_NESTED_THREAD;
|
||||
}
|
||||
|
||||
/* Nothing should touch desc->status from now on */
|
||||
#define status USE_THE_PROPER_WRAPPERS_YOU_MORON
|
||||
|
|
Loading…
Reference in a new issue