diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /arch/x86/kernel/mpparse.c | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 678090508a62..b3fb430725cb 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
| @@ -49,7 +49,7 @@ static int __init mpf_checksum(unsigned char *mp, int len) | |||
| 49 | return sum & 0xFF; | 49 | return sum & 0xFF; |
| 50 | } | 50 | } |
| 51 | 51 | ||
| 52 | static void __cpuinit MP_processor_info(struct mpc_config_processor *m) | 52 | static void __init MP_processor_info(struct mpc_config_processor *m) |
| 53 | { | 53 | { |
| 54 | int apicid; | 54 | int apicid; |
| 55 | char *bootup_cpu = ""; | 55 | char *bootup_cpu = ""; |
| @@ -484,7 +484,7 @@ static void __init construct_default_ioirq_mptable(int mpc_default_type) | |||
| 484 | } | 484 | } |
| 485 | 485 | ||
| 486 | 486 | ||
| 487 | static void construct_ioapic_table(int mpc_default_type) | 487 | static void __init construct_ioapic_table(int mpc_default_type) |
| 488 | { | 488 | { |
| 489 | struct mpc_config_ioapic ioapic; | 489 | struct mpc_config_ioapic ioapic; |
| 490 | struct mpc_config_bus bus; | 490 | struct mpc_config_bus bus; |
| @@ -529,7 +529,7 @@ static void construct_ioapic_table(int mpc_default_type) | |||
| 529 | construct_default_ioirq_mptable(mpc_default_type); | 529 | construct_default_ioirq_mptable(mpc_default_type); |
| 530 | } | 530 | } |
| 531 | #else | 531 | #else |
| 532 | static inline void construct_ioapic_table(int mpc_default_type) { } | 532 | static inline void __init construct_ioapic_table(int mpc_default_type) { } |
| 533 | #endif | 533 | #endif |
| 534 | 534 | ||
| 535 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) | 535 | static inline void __init construct_default_ISA_mptable(int mpc_default_type) |