Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0939e4fd authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 018e047f

arch/x86/include/asm/apic.h

+15 −0
Original line number Diff line number Diff line
@@ -41,6 +41,21 @@ extern unsigned int apic_verbosity; 
extern int local_apic_timer_c2_ok;



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.

 */

arch/x86/include/asm/genapic.h

+7 −0
Original line number Diff line number Diff line
@@ -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);

#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 */

arch/x86/include/asm/mach-default/mach_wakecpu.h

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
#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 */

arch/x86/kernel/smpboot.c

+0 −1
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ 
#include <linux/mc146818rtc.h>



#include <mach_apic.h>

#include <mach_wakecpu.h>

#include <smpboot_hooks.h>



#ifdef CONFIG_X86_32

arch/x86/mach-generic/bigsmp.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <asm/bigsmp/apic.h>

#include <asm/bigsmp/ipi.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 */