From 4533bb7b9ac7955f25d3229c7a1ed5ed67381d2a Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Thu, 3 Feb 2011 20:48:29 +0100 Subject: [PATCH] --- yaml --- r: 234737 b: refs/heads/master c: 91c499178139d6597e68db19638e4135510a34b8 h: refs/heads/master i: 234735: 6f652f2c9dd1f7a54294c2c6c29c3b02614f62a4 v: v3 --- [refs] | 2 +- trunk/include/linux/irq.h | 3 +++ trunk/include/linux/irqdesc.h | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 1a82773aafce..6038cf98cde8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d2cd17fde1fc3e93302815f049f255bb2b3123e +refs/heads/master: 91c499178139d6597e68db19638e4135510a34b8 diff --git a/trunk/include/linux/irq.h b/trunk/include/linux/irq.h index 3ce45c257edb..62bb08e4af13 100644 --- a/trunk/include/linux/irq.h +++ b/trunk/include/linux/irq.h @@ -102,6 +102,8 @@ struct msi_desc; * struct irq_data - per irq and irq chip data passed down to chip functions * @irq: interrupt number * @node: node index useful for balancing + * @state_use_accessor: status information for irq chip functions. + * Use accessor functions to deal with it * @chip: low level interrupt hardware access * @handler_data: per-IRQ data for the irq_chip methods * @chip_data: platform-specific per-chip private data for the chip @@ -116,6 +118,7 @@ struct msi_desc; struct irq_data { unsigned int irq; unsigned int node; + unsigned int state_use_accessors; struct irq_chip *chip; void *handler_data; void *chip_data; diff --git a/trunk/include/linux/irqdesc.h b/trunk/include/linux/irqdesc.h index 782bf9851a9f..581d9665fd38 100644 --- a/trunk/include/linux/irqdesc.h +++ b/trunk/include/linux/irqdesc.h @@ -48,6 +48,7 @@ struct irq_desc { struct { unsigned int irq; unsigned int node; + unsigned int pad_do_not_even_think_about_it; struct irq_chip *chip; void *handler_data; void *chip_data;