renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-11-20 16:46:23 +08:00
Code

genirq: Force wrapped access to desc->status in core code

Browse Source 
Force the usage of wrappers by another nasty CPP substitution.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner 2011-02-09 14:54:49 +01:00
parent 1ccb4e612f
commit f9e4989eb8
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel/irq/handle.c
View File

@ -55,7 +55,7 @@ irqreturn_t
handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
{ {
irqreturn_t ret, retval = IRQ_NONE; 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 { do {
trace_irq_handler_entry(irq, action); 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 */ /* Fall through to add to randomness */
case IRQ_HANDLED: case IRQ_HANDLED:
status |= action->flags; random |= action->flags;
break; break;
default: default:
@ -109,7 +109,7 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action)
action = action->next; action = action->next;
} while (action); } while (action);
if (status & IRQF_SAMPLE_RANDOM) if (random & IRQF_SAMPLE_RANDOM)
add_interrupt_randomness(irq); add_interrupt_randomness(irq);
if (!noirqdebug) if (!noirqdebug)

4
kernel/irq/irqdesc.c
View File

@ -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.chip_data = NULL;
desc->irq_data.handler_data = NULL; desc->irq_data.handler_data = NULL;
desc->irq_data.msi_desc = 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->istate = IRQS_DISABLED;
desc->handle_irq = handle_bad_irq; desc->handle_irq = handle_bad_irq;
desc->depth = 1; desc->depth = 1;
@ -247,7 +247,6 @@ int __init early_irq_init(void)
struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = { struct irq_desc irq_desc[NR_IRQS] __cacheline_aligned_in_smp = {
[0 ... NR_IRQS-1] = { [0 ... NR_IRQS-1] = {
.status = _IRQ_DEFAULT_INIT_FLAGS,
.istate = IRQS_DISABLED, .istate = IRQS_DISABLED,
.handle_irq = handle_bad_irq, .handle_irq = handle_bad_irq,
.depth = 1, .depth = 1,
@ -271,6 +270,7 @@ int __init early_irq_init(void)
desc[i].irq_data.irq = i; desc[i].irq_data.irq = i;
desc[i].irq_data.chip = &no_irq_chip; desc[i].irq_data.chip = &no_irq_chip;
desc[i].kstat_irqs = alloc_percpu(unsigned int); 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); alloc_masks(desc + i, GFP_KERNEL, node);
desc_smp_init(desc + i, node); desc_smp_init(desc + i, node);
lockdep_set_class(&desc[i].lock, &irq_desc_lock_class); lockdep_set_class(&desc[i].lock, &irq_desc_lock_class);

3
kernel/irq/settings.h
View File

@ -148,3 +148,6 @@ static inline bool irq_settings_is_nested_thread(struct irq_desc *desc)
{ {
return desc->status & _IRQ_NESTED_THREAD; return desc->status & _IRQ_NESTED_THREAD;
} }
/* Nothing should touch desc->status from now on */
#define status USE_THE_PROPER_WRAPPERS_YOU_MORON