[PATCH] x86/apic: Remove the SET_APIC_ID(x) macro

[Dou Liyang]

-remove the SET_APIC_ID(x) macro
 -simplify the call flow
 -add a comment

Signed-off-by: Dou Liyang 
---
 arch/x86/include/asm/apic.h | 7 +--
 arch/x86/kernel/apic/apic.c | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 730ef65..b0b4b43 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -252,12 +252,6 @@ static inline int x2apic_enabled(void) { return 0; }
 #definex2apic_supported()  (0)
 #endif /* !CONFIG_X86_X2APIC */
 
-#ifdef CONFIG_X86_64
-#defineSET_APIC_ID(x)  (apic->set_apic_id(x))
-#else
-
-#endif
-
 /*
  * Copyright 2004 James Cleverdon, IBM.
  * Subject to the GNU Public License, v.2
@@ -299,6 +293,7 @@ struct apic {
int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
unsigned int (*get_apic_id)(unsigned long x);
+   /* Cann't be NULL on 64-bit. */
unsigned long (*set_apic_id)(unsigned int id);
 
int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index aee7ded..f3034ba 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2249,7 +2249,7 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, 
u32 v))
 static void __init apic_bsp_up_setup(void)
 {
 #ifdef CONFIG_X86_64
-   apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
+   apic_write(APIC_ID, apic->set_apic_id(boot_cpu_physical_apicid));
 #else
/*
 * Hack: In case of kdump, after a crash, kernel might be booting
-- 
2.5.5

[PATCH] x86/apic: Remove the SET_APIC_ID(x) macro

[Dou Liyang]

-remove the SET_APIC_ID(x) macro
 -simplify the call flow
 -add a comment

Signed-off-by: Dou Liyang 
---
 arch/x86/include/asm/apic.h | 7 +--
 arch/x86/kernel/apic/apic.c | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 730ef65..b0b4b43 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -252,12 +252,6 @@ static inline int x2apic_enabled(void) { return 0; }
 #definex2apic_supported()  (0)
 #endif /* !CONFIG_X86_X2APIC */
 
-#ifdef CONFIG_X86_64
-#defineSET_APIC_ID(x)  (apic->set_apic_id(x))
-#else
-
-#endif
-
 /*
  * Copyright 2004 James Cleverdon, IBM.
  * Subject to the GNU Public License, v.2
@@ -299,6 +293,7 @@ struct apic {
int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
unsigned int (*get_apic_id)(unsigned long x);
+   /* Cann't be NULL on 64-bit. */
unsigned long (*set_apic_id)(unsigned int id);
 
int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask,
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index aee7ded..f3034ba 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -2249,7 +2249,7 @@ void __init apic_set_eoi_write(void (*eoi_write)(u32 reg, 
u32 v))
 static void __init apic_bsp_up_setup(void)
 {
 #ifdef CONFIG_X86_64
-   apic_write(APIC_ID, SET_APIC_ID(boot_cpu_physical_apicid));
+   apic_write(APIC_ID, apic->set_apic_id(boot_cpu_physical_apicid));
 #else
/*
 * Hack: In case of kdump, after a crash, kernel might be booting
-- 
2.5.5