OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

sparseirq: work around compiler optimizing away __weak functions 

Impact: fix panic on null pointer with sparseirq

Some GCC versions seem to inline the weak global function,
when that function is empty.

Work it around, by making the functions return a (dummy) integer.

Signed-off-by: Yinghai <yinghai@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-12-26 02:05:47 -08:00 committed by Ingo Molnar
parent 793f7b12a0
commit 13a0c3c269
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/kernel/io_apic.c
View File

@ -170,7 +170,7 @@ static struct irq_cfg irq_cfgx[NR_IRQS] = {
[15] = { .domain = CPU_MASK_ALL, .vector = IRQ15_VECTOR, }, [15] = { .domain = CPU_MASK_ALL, .vector = IRQ15_VECTOR, },
}; };
void __init arch_early_irq_init(void) int __init arch_early_irq_init(void)
{ {
struct irq_cfg *cfg; struct irq_cfg *cfg;
struct irq_desc *desc; struct irq_desc *desc;
@ -184,6 +184,8 @@ void __init arch_early_irq_init(void)
desc = irq_to_desc(i); desc = irq_to_desc(i);
desc->chip_data = &cfg[i]; desc->chip_data = &cfg[i];
} }
return 0;
} }
#ifdef CONFIG_SPARSE_IRQ #ifdef CONFIG_SPARSE_IRQ
@ -212,7 +214,7 @@ static struct irq_cfg *get_one_free_irq_cfg(int cpu)
return cfg; return cfg;
} }
void arch_init_chip_data(struct irq_desc *desc, int cpu) int arch_init_chip_data(struct irq_desc *desc, int cpu)
{ {
struct irq_cfg *cfg; struct irq_cfg *cfg;
@ -224,6 +226,8 @@ void arch_init_chip_data(struct irq_desc *desc, int cpu)
BUG_ON(1); BUG_ON(1);
} }
} }
return 0;
} }
#ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC #ifdef CONFIG_NUMA_MIGRATE_IRQ_DESC

6
include/linux/irq.h
View File

@ -193,9 +193,9 @@ struct irq_desc {
const char *name; const char *name;
} ____cacheline_internodealigned_in_smp; } ____cacheline_internodealigned_in_smp;
extern void early_irq_init(void); extern int early_irq_init(void);
extern void arch_early_irq_init(void); extern int arch_early_irq_init(void);
extern void arch_init_chip_data(struct irq_desc *desc, int cpu); extern int arch_init_chip_data(struct irq_desc *desc, int cpu);
extern void arch_init_copy_chip_data(struct irq_desc *old_desc, extern void arch_init_copy_chip_data(struct irq_desc *old_desc,
struct irq_desc *desc, int cpu); struct irq_desc *desc, int cpu);
extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc); extern void arch_free_chip_data(struct irq_desc *old_desc, struct irq_desc *desc);

7
init/main.c
View File

@ -539,13 +539,14 @@ void __init __weak thread_info_cache_init(void)
{ {
} }
void __init __weak arch_early_irq_init(void) int __init __weak arch_early_irq_init(void)
{ {
return 0;
} }
void __init __weak early_irq_init(void) int __init __weak early_irq_init(void)
{ {
arch_early_irq_init(); return arch_early_irq_init();
} }
asmlinkage void __init start_kernel(void) asmlinkage void __init start_kernel(void)

7
kernel/irq/handle.c
View File

@ -86,8 +86,9 @@ void init_kstat_irqs(struct irq_desc *desc, int cpu, int nr)
desc->kstat_irqs = (unsigned int *)ptr; desc->kstat_irqs = (unsigned int *)ptr;
} }
void __attribute__((weak)) arch_init_chip_data(struct irq_desc *desc, int cpu) int __weak arch_init_chip_data(struct irq_desc *desc, int cpu)
{ {
return 0;
} }
static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu) static void init_one_irq_desc(int irq, struct irq_desc *desc, int cpu)
@ -132,7 +133,7 @@ static struct irq_desc irq_desc_legacy[NR_IRQS_LEGACY] __cacheline_aligned_in_sm
/* FIXME: use bootmem alloc ...*/ /* FIXME: use bootmem alloc ...*/
static unsigned int kstat_irqs_legacy[NR_IRQS_LEGACY][NR_CPUS]; static unsigned int kstat_irqs_legacy[NR_IRQS_LEGACY][NR_CPUS];
void __init early_irq_init(void) int __init early_irq_init(void)
{ {
struct irq_desc *desc; struct irq_desc *desc;
int legacy_count; int legacy_count;
@ -151,7 +152,7 @@ void __init early_irq_init(void)
for (i = legacy_count; i < NR_IRQS; i++) for (i = legacy_count; i < NR_IRQS; i++)
irq_desc_ptrs[i] = NULL; irq_desc_ptrs[i] = NULL;
arch_early_irq_init(); return arch_early_irq_init();
} }
struct irq_desc *irq_to_desc(unsigned int irq) struct irq_desc *irq_to_desc(unsigned int irq)