[PATCH 10/18] x86: add hard_smp_prossor_id with MACRO in io_apic_xx.c

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Ingo Molnar <mingo@...>, Thomas Gleixner <tglx@...>, H. Peter Anvin <hpa@...>, Andrew Morton <akpm@...>
Cc: <linux-kernel@...>, Yinghai Lu <yhlu.kernel@...>
Date: Sunday, August 24, 2008 - 5:01 am

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
---
 arch/x86/kernel/apic_32.c |    7 +++++++
 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 cbac5ff..6fb2b45 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)
 	cpu_set(cpu, cpu_present_map);
 }
 
+#ifdef CONFIG_X86_64
+int hard_smp_processor_id(void)
+{
+	return read_apic_id();
+}
+#endif
+
 /*
  * Power management
  */
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index d3ec746..eeb6983 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)
 	cpu_set(cpu, cpu_present_map);
 }
 
+#ifdef CONFIG_X86_64
 int hard_smp_processor_id(void)
 {
 	return read_apic_id();
 }
+#endif
 
 /*
  * Power management
-- 
1.5.4.5

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
An idea .... with code, jassi brar, (Sun Aug 24, 4:53 am)
[PATCH 00/18] merge apic_32.c and apic_64.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
Re: An idea .... with code, Andi Kleen, (Tue Aug 26, 4:24 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 3:24 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 3:47 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 8:38 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 8:47 am)
Re: An idea .... with code, Kasper Sandberg, (Wed Aug 27, 10:49 am)
Re: An idea .... with code, Bill Davidsen, (Fri Aug 29, 10:57 pm)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 11:02 am)
Re: An idea .... with code, Kasper Sandberg, (Thu Aug 28, 5:41 am)
Re: An idea .... with code, jassi brar, (Wed Aug 27, 9:24 pm)
Re: An idea .... with code, David Newall, (Wed Aug 27, 5:57 am)
Re: An idea .... with code, Andi Kleen, (Wed Aug 27, 6:01 am)
Re: An idea .... with code, Alexey Dobriyan, (Tue Aug 26, 6:44 am)
Re: An idea .... with code, Andi Kleen, (Tue Aug 26, 7:08 am)
Re: An idea .... with code, Bill Davidsen, (Mon Aug 25, 10:47 pm)
Re: An idea .... with code, Jochen Voß, (Mon Aug 25, 8:22 am)
Re: An idea .... with code, Marcin Slusarz, (Mon Aug 25, 4:53 pm)
Re: [PATCH 00/18] merge apic_32.c and apic_64.c, Ingo Molnar, (Sun Aug 24, 8:16 am)
Re: [PATCH 00/18] merge apic_32.c and apic_64.c, Ingo Molnar, (Sun Aug 24, 5:14 am)
[PATCH 17/18] x86: apic copy apic_64.c to apic_32.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 14/18] x86: merge header files in apic_xx.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 12/18] x86: merge APIC_init_uniprocessor, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 11/18] x86: make apic_32/64.c more like, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 10/18] x86: add hard_smp_prossor_id with MACRO in io_..., Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 09/18] x86: use HAVE_X2APIC in apic_64.c, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 08/18] x86: apic_xx.c order variables, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 05/18] x86: apic - unify setup_local_APIC, Yinghai Lu, (Sun Aug 24, 5:01 am)
[PATCH 03/18] x86: apic - unify setup_apicpmtimer, Yinghai Lu, (Sun Aug 24, 5:01 am)