summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-10-12 21:58:27 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-10-12 21:59:55 +0200
commitc0a19ebc018222ffd1dd93af5b53d9efd779c19b (patch)
treef648fb93efb064b22000aca24e48dfda2cbfab0a /kernel
parent2ee39065988d632b403f8470942b0b5edee3632b (diff)
downloadop-kernel-dev-c0a19ebc018222ffd1dd93af5b53d9efd779c19b.zip
op-kernel-dev-c0a19ebc018222ffd1dd93af5b53d9efd779c19b.tar.gz
genirq: Fix CONFIG_GENIRQ_NO_DEPRECATED=y build
This option can be set to verify the full conversion to the new chip functions. Fix the fallout of the patch rework, so the core code compiles and works with it. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/irq/dummychip.c2
-rw-r--r--kernel/irq/irqdesc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/dummychip.c b/kernel/irq/dummychip.c
index 918dea9..20dc547 100644
--- a/kernel/irq/dummychip.c
+++ b/kernel/irq/dummychip.c
@@ -31,7 +31,7 @@ static unsigned int noop_ret(struct irq_data *data)
return 0;
}
-#ifndef CONFIG_GENERIC_HARDIRQS_NO_CRUFT
+#ifndef CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED
static void compat_noop(unsigned int irq) { }
#define END_INIT .end = compat_noop
#else
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index f6f660c..9d917ff 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -118,7 +118,7 @@ static void free_masks(struct irq_desc *desc)
#ifdef CONFIG_GENERIC_PENDING_IRQ
free_cpumask_var(desc->pending_mask);
#endif
- free_cpumask_var(desc->affinity);
+ free_cpumask_var(desc->irq_data.affinity);
}
#else
static inline void free_masks(struct irq_desc *desc) { }
OpenPOWER on IntegriCloud