diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:55:37 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-29 14:16:42 +0100 |
| commit | 1dcdd3d15ecea0c22a09d4d001a39d425fceff2c (patch) | |
| tree | 91419ae421b2d1cac6297c9671eac2ff7723d7c2 /arch/x86/mach-generic | |
| parent | 7c20dcc545d78946e40e8fab99637fe815b1d211 (diff) | |
| download | linux-1dcdd3d15ecea0c22a09d4d001a39d425fceff2c.tar.bz2 | |
x86: remove mach_apic.h
Spread mach_apic.h definitions into genapic.h. (with some knock-on effects
on smp.h and apic.h.)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mach-generic')
| -rw-r--r-- | arch/x86/mach-generic/default.c | 2 | ||||
| -rw-r--r-- | arch/x86/mach-generic/probe.c | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c index 07817b2a7876..7d5123e474e1 100644 --- a/arch/x86/mach-generic/default.c +++ b/arch/x86/mach-generic/default.c @@ -12,7 +12,7 @@ #include <linux/string.h> #include <linux/smp.h> #include <linux/init.h> -#include <asm/mach-default/mach_apic.h> +#include <asm/genapic.h> #include <asm/mach-default/mach_ipi.h> static void default_vector_allocation_domain(int cpu, struct cpumask *retmask) diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c index ab68c6e5c48a..c03c72221320 100644 --- a/arch/x86/mach-generic/probe.c +++ b/arch/x86/mach-generic/probe.c @@ -154,8 +154,3 @@ int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id) } return 0; } - -int hard_smp_processor_id(void) -{ - return apic->get_apic_id(*(unsigned long *)(APIC_BASE+APIC_ID)); -} |