Skip to content

Commit

Permalink
genirq: Protect tglx from tripping over his own feet
Browse files Browse the repository at this point in the history
The irq_desc.status field will either go away or renamed to
settings. Anyway we need to maintain compatibility to avoid breaking
the world and some more. While moving bits into the core, I need to
avoid that I use any of the still existing IRQ_ bits in the core code
by typos. So that file will hold the inline wrappers and some nasty
CPP tricks to break the build when typoed.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Thomas Gleixner committed Feb 19, 2011
1 parent dbec07b commit e6bea9c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
2 changes: 2 additions & 0 deletions kernel/irq/internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
# define IRQ_BITMAP_BITS NR_IRQS
#endif

#include "settings.h"

#define istate core_internal_state__do_not_mess_with_it

extern int noirqdebug;
Expand Down
4 changes: 2 additions & 2 deletions kernel/irq/irqdesc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
desc->status = _IRQ_DEFAULT_INIT_FLAGS;
desc->handle_irq = handle_bad_irq;
desc->depth = 1;
desc->irq_count = 0;
Expand Down Expand Up @@ -246,7 +246,7 @@ 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,
.status = _IRQ_DEFAULT_INIT_FLAGS,
.handle_irq = handle_bad_irq,
.depth = 1,
.lock = __RAW_SPIN_LOCK_UNLOCKED(irq_desc->lock),
Expand Down
7 changes: 7 additions & 0 deletions kernel/irq/settings.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*
* Internal header to deal with irq_desc->status which will be renamed
* to irq_desc->settings.
*/
enum {
_IRQ_DEFAULT_INIT_FLAGS = IRQ_DEFAULT_INIT_FLAGS,
};

0 comments on commit e6bea9c

Please sign in to comment.