From a2a83e248f6169391e618f7a1d1c928b12e8550e Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 12 Oct 2010 21:58:27 +0200 Subject: [PATCH] --- yaml --- r: 212226 b: refs/heads/master c: c0a19ebc018222ffd1dd93af5b53d9efd779c19b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/irq/dummychip.c | 2 +- trunk/kernel/irq/irqdesc.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a9c7dbf2a9af..e51f912623d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2ee39065988d632b403f8470942b0b5edee3632b +refs/heads/master: c0a19ebc018222ffd1dd93af5b53d9efd779c19b diff --git a/trunk/kernel/irq/dummychip.c b/trunk/kernel/irq/dummychip.c index 918dea9de9ea..20dc5474947e 100644 --- a/trunk/kernel/irq/dummychip.c +++ b/trunk/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/trunk/kernel/irq/irqdesc.c b/trunk/kernel/irq/irqdesc.c index f6f660cef7af..9d917ff72675 100644 --- a/trunk/kernel/irq/irqdesc.c +++ b/trunk/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) { }