leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, smp: eliminate asm/mach-default/mach_wakecpu.h

Browse Source 
Spread mach_wakecpu.h's definitions into apic.h and genapic.h
and remove mach_wakecpu.h.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2009-01-28 17:16:25 +01:00
parent 018e047f3a
commit 0939e4fd35
8 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/x86/include/asm/apic.h
View File

@ -41,6 +41,21 @@ extern unsigned int apic_verbosity;
extern int local_apic_timer_c2_ok; extern int local_apic_timer_c2_ok;
extern int disable_apic; extern int disable_apic;
#ifdef CONFIG_SMP
extern void __inquire_remote_apic(int apicid);
#else /* CONFIG_SMP */
static inline void __inquire_remote_apic(int apicid)
{
}
#endif /* CONFIG_SMP */
static inline void default_inquire_remote_apic(int apicid)
{
if (apic_verbosity >= APIC_DEBUG)
__inquire_remote_apic(apicid);
}
/* /*
* Basic functions accessing APICs. * Basic functions accessing APICs.
*/ */

7
arch/x86/include/asm/genapic.h
View File

@ -113,4 +113,11 @@ 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 boot_cpu_physical_apicid);
#endif #endif
static inline void default_wait_for_init_deassert(atomic_t *deassert)
{
while (!atomic_read(deassert))
cpu_relax();
return;
}
#endif /* _ASM_X86_GENAPIC_64_H */ #endif /* _ASM_X86_GENAPIC_64_H */

25
arch/x86/include/asm/mach-default/mach_wakecpu.h
View File

@ -1,25 +0,0 @@
#ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
#define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H
static inline void default_wait_for_init_deassert(atomic_t *deassert)
{
while (!atomic_read(deassert))
cpu_relax();
return;
}
#ifdef CONFIG_SMP
extern void __inquire_remote_apic(int apicid);
#else /* CONFIG_SMP */
static inline void __inquire_remote_apic(int apicid)
{
}
#endif /* CONFIG_SMP */
static inline void default_inquire_remote_apic(int apicid)
{
if (apic_verbosity >= APIC_DEBUG)
__inquire_remote_apic(apicid);
}
#endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */

1
arch/x86/kernel/smpboot.c
View File

@ -66,7 +66,6 @@
#include <linux/mc146818rtc.h> #include <linux/mc146818rtc.h>
#include <mach_apic.h> #include <mach_apic.h>
#include <mach_wakecpu.h>
#include <smpboot_hooks.h> #include <smpboot_hooks.h>
#ifdef CONFIG_X86_32 #ifdef CONFIG_X86_32

1
arch/x86/mach-generic/bigsmp.c
View File

@ -17,7 +17,6 @@
#include <asm/bigsmp/apic.h> #include <asm/bigsmp/apic.h>
#include <asm/bigsmp/ipi.h> #include <asm/bigsmp/ipi.h>
#include <asm/mach-default/mach_mpparse.h> #include <asm/mach-default/mach_mpparse.h>
#include <asm/mach-default/mach_wakecpu.h>
static int dmi_bigsmp; /* can be set by dmi scanners */ static int dmi_bigsmp; /* can be set by dmi scanners */

1
arch/x86/mach-generic/default.c
View File

@ -16,7 +16,6 @@
#include <asm/mach-default/mach_apic.h> #include <asm/mach-default/mach_apic.h>
#include <asm/mach-default/mach_ipi.h> #include <asm/mach-default/mach_ipi.h>
#include <asm/mach-default/mach_mpparse.h> #include <asm/mach-default/mach_mpparse.h>
#include <asm/mach-default/mach_wakecpu.h>
static void default_vector_allocation_domain(int cpu, struct cpumask *retmask) static void default_vector_allocation_domain(int cpu, struct cpumask *retmask)
{ {

1
arch/x86/mach-generic/es7000.c
View File

@ -14,7 +14,6 @@
#include <linux/acpi.h> #include <linux/acpi.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/ipi.h> #include <asm/ipi.h>
#include <asm/mach-default/mach_wakecpu.h>
#define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER)
#define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio)

1
arch/x86/mach-generic/summit.c
View File

@ -16,7 +16,6 @@
#include <asm/summit/apic.h> #include <asm/summit/apic.h>
#include <asm/summit/ipi.h> #include <asm/summit/ipi.h>
#include <asm/summit/mpparse.h> #include <asm/summit/mpparse.h>
#include <asm/mach-default/mach_wakecpu.h>
static int probe_summit(void) static int probe_summit(void)
{ {