diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-08-24 05:01:48 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 10:53:02 -0400 |
commit | 3491998dd54f6d4ef7344518fe5463b299fdf537 (patch) | |
tree | 879f7d82d6c9894a0a149b3e73ce95f8763d9d2f /arch | |
parent | 49899eacce79ce39faf531dad3e00f771eba2eb1 (diff) |
x86: add hard_smp_prossor_id with MACRO in io_apic_xx.c
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 7 | ||||
-rw-r--r-- | arch/x86/kernel/apic_64.c | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index a54512bea629..93718ffb9b9c 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c | |||
@@ -1600,6 +1600,13 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
1600 | cpu_set(cpu, cpu_present_map); | 1600 | cpu_set(cpu, cpu_present_map); |
1601 | } | 1601 | } |
1602 | 1602 | ||
1603 | #ifdef CONFIG_X86_64 | ||
1604 | int hard_smp_processor_id(void) | ||
1605 | { | ||
1606 | return read_apic_id(); | ||
1607 | } | ||
1608 | #endif | ||
1609 | |||
1603 | /* | 1610 | /* |
1604 | * Power management | 1611 | * Power management |
1605 | */ | 1612 | */ |
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index d3ec746aede4..eeb69838c2f8 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -1612,10 +1612,12 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
1612 | cpu_set(cpu, cpu_present_map); | 1612 | cpu_set(cpu, cpu_present_map); |
1613 | } | 1613 | } |
1614 | 1614 | ||
1615 | #ifdef CONFIG_X86_64 | ||
1615 | int hard_smp_processor_id(void) | 1616 | int hard_smp_processor_id(void) |
1616 | { | 1617 | { |
1617 | return read_apic_id(); | 1618 | return read_apic_id(); |
1618 | } | 1619 | } |
1620 | #endif | ||
1619 | 1621 | ||
1620 | /* | 1622 | /* |
1621 | * Power management | 1623 | * Power management |