From 014b9def385e032e5d09d4455a7eacfdb1ca19cb Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 9 Feb 2011 13:16:52 +0100
Subject: [PATCH] --- yaml --- r: 234724 b: refs/heads/master c:
 e6bea9c404699223322d7411c6f2ceaec02fa83c h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/irq/internals.h | 2 ++
 trunk/kernel/irq/irqdesc.c   | 4 ++--
 trunk/kernel/irq/settings.h  | 7 +++++++
 4 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 trunk/kernel/irq/settings.h

diff --git a/[refs] b/[refs]
index d9e60bbbb333..d1bdd6c7ccee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbec07bac614a61e3392c1e7c08cc6a49ad43f7a
+refs/heads/master: e6bea9c404699223322d7411c6f2ceaec02fa83c
diff --git a/trunk/kernel/irq/internals.h b/trunk/kernel/irq/internals.h
index ae96e688f4e1..8f200310a952 100644
--- a/trunk/kernel/irq/internals.h
+++ b/trunk/kernel/irq/internals.h
@@ -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;
diff --git a/trunk/kernel/irq/irqdesc.c b/trunk/kernel/irq/irqdesc.c
index 6f6644f819dd..8b87f2ce0203 100644
--- a/trunk/kernel/irq/irqdesc.c
+++ b/trunk/kernel/irq/irqdesc.c
@@ -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;
@@ -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),
diff --git a/trunk/kernel/irq/settings.h b/trunk/kernel/irq/settings.h
new file mode 100644
index 000000000000..610f55597ce7
--- /dev/null
+++ b/trunk/kernel/irq/settings.h
@@ -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,
+};