From 32ac201c57381c8d3d6a8f79c1ebd3ddcb4d7b17 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Mon, 7 Feb 2011 20:19:55 +0100 Subject: [PATCH] --- yaml --- r: 234723 b: refs/heads/master c: dbec07bac614a61e3392c1e7c08cc6a49ad43f7a h: refs/heads/master i: 234721: a2781f6a4755614984d3489248e21e5edbeeb043 234719: a051864e44e4391c766419ce40d778a522d79de9 v: v3 --- [refs] | 2 +- trunk/include/linux/irqdesc.h | 3 ++- trunk/kernel/irq/internals.h | 6 ++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c123ea8bfbdd..d9e60bbbb333 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 35e857cbeb24e75c6f9a9312ac30454eee8c5950 +refs/heads/master: dbec07bac614a61e3392c1e7c08cc6a49ad43f7a diff --git a/trunk/include/linux/irqdesc.h b/trunk/include/linux/irqdesc.h index 64794dec93b6..782bf9851a9f 100644 --- a/trunk/include/linux/irqdesc.h +++ b/trunk/include/linux/irqdesc.h @@ -19,6 +19,7 @@ struct timer_rand_state; * @handle_irq: highlevel irq-events handler [if NULL, __do_IRQ()] * @action: the irq action chain * @status: status information + * @core_internal_state__do_not_mess_with_it: core internal status information * @depth: disable-depth, for nested irq_disable() calls * @wake_depth: enable depth, for multiple set_irq_wake() callers * @irq_count: stats field to detect stalled irqs @@ -63,7 +64,7 @@ struct irq_desc { irq_flow_handler_t handle_irq; struct irqaction *action; /* IRQ action list */ unsigned int status; /* IRQ status */ - + unsigned int core_internal_state__do_not_mess_with_it; unsigned int depth; /* nested irq disables */ unsigned int wake_depth; /* nested wake enables */ unsigned int irq_count; /* For detecting broken IRQs */ diff --git a/trunk/kernel/irq/internals.h b/trunk/kernel/irq/internals.h index b61824cdadc6..ae96e688f4e1 100644 --- a/trunk/kernel/irq/internals.h +++ b/trunk/kernel/irq/internals.h @@ -1,5 +1,9 @@ /* * IRQ subsystem internal functions and variables: + * + * Do not ever include this file from anything else than + * kernel/irq/. Do not even think about using any information outside + * of this file for your non core code. */ #include @@ -9,6 +13,8 @@ # define IRQ_BITMAP_BITS NR_IRQS #endif +#define istate core_internal_state__do_not_mess_with_it + extern int noirqdebug; /*