leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

irq: hide debug macros so they don't collide with others.

Browse Source 
The file kernel/irq/debug.h temporarily defines P, PS, PD
and then undefines them.  However these names aren't really
"internal" enough, and collide with other more legit users
such as the ones in the xtensa arch, causing:

In file included from kernel/irq/internals.h:58:0,
                 from kernel/irq/irqdesc.c:18:
kernel/irq/debug.h:8:0: warning: "PS" redefined [enabled by default]
arch/xtensa/include/asm/regs.h:59:0: note: this is the location of the previous definition

Add a handful of underscores to do a better job of hiding these
temporary macros.

Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
Paul Gortmaker 2012-04-18 16:29:57 -04:00
parent bfae8ee8d2
commit 9f3045eca8
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
kernel/irq/debug.h
View File

@ -4,10 +4,10 @@
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#define P(f) if (desc->status_use_accessors & f) printk("%14s set\n", #f) #define ___P(f) if (desc->status_use_accessors & f) printk("%14s set\n", #f)
#define PS(f) if (desc->istate & f) printk("%14s set\n", #f) #define ___PS(f) if (desc->istate & f) printk("%14s set\n", #f)
/* FIXME */ /* FIXME */
#define PD(f) do { } while (0) #define ___PD(f) do { } while (0)
static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc) static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
{ {
@ -23,23 +23,23 @@ static inline void print_irq_desc(unsigned int irq, struct irq_desc *desc)
print_symbol("%s\n", (unsigned long)desc->action->handler); print_symbol("%s\n", (unsigned long)desc->action->handler);
} }
P(IRQ_LEVEL); ___P(IRQ_LEVEL);
P(IRQ_PER_CPU); ___P(IRQ_PER_CPU);
P(IRQ_NOPROBE); ___P(IRQ_NOPROBE);
P(IRQ_NOREQUEST); ___P(IRQ_NOREQUEST);
P(IRQ_NOTHREAD); ___P(IRQ_NOTHREAD);
P(IRQ_NOAUTOEN); ___P(IRQ_NOAUTOEN);
PS(IRQS_AUTODETECT); ___PS(IRQS_AUTODETECT);
PS(IRQS_REPLAY); ___PS(IRQS_REPLAY);
PS(IRQS_WAITING); ___PS(IRQS_WAITING);
PS(IRQS_PENDING); ___PS(IRQS_PENDING);
PD(IRQS_INPROGRESS); ___PD(IRQS_INPROGRESS);
PD(IRQS_DISABLED); ___PD(IRQS_DISABLED);
PD(IRQS_MASKED); ___PD(IRQS_MASKED);
} }
#undef P #undef ___P
#undef PS #undef ___PS
#undef PD #undef ___PD