x86: apic namespace cleanup

KAGA-KOKO · KAGA-KOKO · commit e11dadabf443 · 2009-08-31T21:30:47.000+02:00
boot_cpu_physical_apicid is a global variable and used as function
argument as well. Rename the function arguments to avoid confusion.

Signed-off-by: Thomas Gleixner &lt;tglx@linutronix.de&gt;
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
@@ -292,7 +292,7 @@ struct apic {
 	int (*cpu_present_to_apicid)(int mps_cpu);
 	physid_mask_t (*apicid_to_cpu_present)(int phys_apicid);
 	void (*setup_portio_remap)(void);
-	int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
+	int (*check_phys_apicid_present)(int phys_apicid);
 	void (*enable_apic_mode)(void);
 	int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
@@ -426,7 +426,7 @@ extern struct apic apic_x2apic_uv_x;
 DECLARE_PER_CPU(int, x2apic_extra_bits);
 
 extern int default_cpu_present_to_apicid(int mps_cpu);
-extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
+extern int default_check_phys_apicid_present(int phys_apicid);
 #endif
 
 static inline void default_wait_for_init_deassert(atomic_t *deassert)
@@ -542,9 +542,9 @@ static inline int __default_cpu_present_to_apicid(int mps_cpu)
 }
 
 static inline int
-__default_check_phys_apicid_present(int boot_cpu_physical_apicid)
+__default_check_phys_apicid_present(int phys_apicid)
 {
-	return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map);
+	return physid_isset(phys_apicid, phys_cpu_present_map);
 }
 
 #ifdef CONFIG_X86_32
@@ -554,13 +554,13 @@ static inline int default_cpu_present_to_apicid(int mps_cpu)
 }
 
 static inline int
-default_check_phys_apicid_present(int boot_cpu_physical_apicid)
+default_check_phys_apicid_present(int phys_apicid)
 {
-	return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
+	return __default_check_phys_apicid_present(phys_apicid);
 }
 #else
 extern int default_cpu_present_to_apicid(int mps_cpu);
-extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid);
+extern int default_check_phys_apicid_present(int phys_apicid);
 #endif
 
 static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid)
diff --git a/arch/x86/kernel/apic/bigsmp_32.c b/arch/x86/kernel/apic/bigsmp_32.c
@@ -112,7 +112,7 @@ static physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map)
 	return physids_promote(0xFFL);
 }
 
-static int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid)
+static int bigsmp_check_phys_apicid_present(int phys_apicid)
 {
 	return 1;
 }
diff --git a/arch/x86/kernel/apic/numaq_32.c b/arch/x86/kernel/apic/numaq_32.c
@@ -413,7 +413,7 @@ static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid)
 /* Where the IO area was mapped on multiquad, always 0 otherwise */
 void *xquad_portio;
 
-static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)
+static inline int numaq_check_phys_apicid_present(int phys_apicid)
 {
 	return 1;
 }
diff --git a/arch/x86/kernel/apic/summit_32.c b/arch/x86/kernel/apic/summit_32.c
@@ -272,7 +272,7 @@ static physid_mask_t summit_apicid_to_cpu_present(int apicid)
 	return physid_mask_of_physid(0);
 }
 
-static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)
+static int summit_check_phys_apicid_present(int physical_apicid)
 {
 	return 1;
 }
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
@@ -129,9 +129,9 @@ int default_cpu_present_to_apicid(int mps_cpu)
 	return __default_cpu_present_to_apicid(mps_cpu);
 }
 
-int default_check_phys_apicid_present(int boot_cpu_physical_apicid)
+int default_check_phys_apicid_present(int phys_apicid)
 {
-	return __default_check_phys_apicid_present(boot_cpu_physical_apicid);
+	return __default_check_phys_apicid_present(phys_apicid);
 }
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ static physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map)`
`112`	`112`	`return physids_promote(0xFFL);`
`113`	`113`	`}`
`114`	`114`
`115`		`-static int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid)`
	`115`	`+static int bigsmp_check_phys_apicid_present(int phys_apicid)`
`116`	`116`	`{`
`117`	`117`	`return 1;`
`118`	`118`	`}`
Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid)`
`413`	`413`	`/* Where the IO area was mapped on multiquad, always 0 otherwise */`
`414`	`414`	`void *xquad_portio;`
`415`	`415`
`416`		`-static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid)`
	`416`	`+static inline int numaq_check_phys_apicid_present(int phys_apicid)`
`417`	`417`	`{`
`418`	`418`	`return 1;`
`419`	`419`	`}`
Original file line number	Diff line number	Diff line change
`@@ -272,7 +272,7 @@ static physid_mask_t summit_apicid_to_cpu_present(int apicid)`
`272`	`272`	`return physid_mask_of_physid(0);`
`273`	`273`	`}`
`274`	`274`
`275`		`-static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)`
	`275`	`+static int summit_check_phys_apicid_present(int physical_apicid)`
`276`	`276`	`{`
`277`	`277`	`return 1;`
`278`	`278`	`}`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ int default_cpu_present_to_apicid(int mps_cpu)`
`129`	`129`	`return __default_cpu_present_to_apicid(mps_cpu);`
`130`	`130`	`}`
`131`	`131`
`132`		`-int default_check_phys_apicid_present(int boot_cpu_physical_apicid)`
	`132`	`+int default_check_phys_apicid_present(int phys_apicid)`
`133`	`133`	`{`
`134`		`- return __default_check_phys_apicid_present(boot_cpu_physical_apicid);`
	`134`	`+ return __default_check_phys_apicid_present(phys_apicid);`
`135`	`135`	`}`
`136`	`136`	`#endif`
`137`	`137`