diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 16:39:17 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-27 12:28:43 -0400 |
commit | 6e15cf04860074ad032e88c306bea656bbdd0f22 (patch) | |
tree | c346383bb7563e8d66b2f4a502f875b259c34870 /arch/blackfin/kernel | |
parent | be0ea69674ed95e1e98cb3687a241badc756d228 (diff) | |
parent | 60db56422043aaa455ac7f858ce23c273220f9d9 (diff) |
Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
Conflicts:
arch/parisc/kernel/irq.c
arch/x86/include/asm/fixmap_64.h
arch/x86/include/asm/setup.h
kernel/irq/handle.c
Semantic merge:
arch/x86/include/asm/fixmap.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/blackfin/kernel')
-rw-r--r-- | arch/blackfin/kernel/irqchip.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/blackfin/kernel/irqchip.c b/arch/blackfin/kernel/irqchip.c index bd052a67032e..401bd32aa499 100644 --- a/arch/blackfin/kernel/irqchip.c +++ b/arch/blackfin/kernel/irqchip.c | |||
@@ -70,6 +70,11 @@ static struct irq_desc bad_irq_desc = { | |||
70 | #endif | 70 | #endif |
71 | }; | 71 | }; |
72 | 72 | ||
73 | #ifdef CONFIG_CPUMASK_OFFSTACK | ||
74 | /* We are not allocating a variable-sized bad_irq_desc.affinity */ | ||
75 | #error "Blackfin architecture does not support CONFIG_CPUMASK_OFFSTACK." | ||
76 | #endif | ||
77 | |||
73 | int show_interrupts(struct seq_file *p, void *v) | 78 | int show_interrupts(struct seq_file *p, void *v) |
74 | { | 79 | { |
75 | int i = *(loff_t *) v, j; | 80 | int i = *(loff_t *) v, j; |