x86: remove mach_apicdef.h (1f75ed0c) · Commits · e / devices / android_kernel_sony_msm8994

arch/x86/include/asm/apic.h

+16 −0

Original line number	Original line	Diff line number	Diff line
	@@ -211,4 +211,20 @@ static inline void disable_local_APIC(void) { }

	#endif /* !CONFIG_X86_LOCAL_APIC */		#endif /* !CONFIG_X86_LOCAL_APIC */

			#ifdef CONFIG_X86_64
			#define SET_APIC_ID(x) (apic->set_apic_id(x))
			#else

			static inline unsigned default_get_apic_id(unsigned long x)
			{
			unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));

			if (APIC_XAPIC(ver))
			return (x >> 24) & 0xFF;
			else
			return (x >> 24) & 0x0F;
			}

			#endif

	#endif /* _ASM_X86_APIC_H */		#endif /* _ASM_X86_APIC_H */

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3,7 +3,6 @@

	#ifdef CONFIG_X86_LOCAL_APIC		#ifdef CONFIG_X86_LOCAL_APIC

	#include <mach_apicdef.h>
	#include <asm/smp.h>		#include <asm/smp.h>

	#define APIC_DFR_VALUE (APIC_DFR_FLAT)		#define APIC_DFR_VALUE (APIC_DFR_FLAT)

deleted100644 → 0

+0 −22

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H
	#define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H

	#include <asm/apic.h>

	#ifdef CONFIG_X86_64
	#define SET_APIC_ID(x) (apic->set_apic_id(x))
	#else

	static inline unsigned default_get_apic_id(unsigned long x)
	{
	unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));

	if (APIC_XAPIC(ver))
	return (x >> 24) & 0xFF;
	else
	return (x >> 24) & 0x0F;
	}

	#endif

	#endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */

deleted100644 → 0

+0 −8

Original line number	Original line	Diff line number	Diff line
	#ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H
	#define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H

	#ifndef APIC_DEFINITION
	#include <asm/genapic.h>
	#endif

	#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -173,6 +173,8 @@ extern int safe_smp_processor_id(void);

	#endif		#endif

			#include <asm/genapic.h>

	#ifdef CONFIG_X86_LOCAL_APIC		#ifdef CONFIG_X86_LOCAL_APIC

	#ifndef CONFIG_X86_64		#ifndef CONFIG_X86_64
	@@ -182,7 +184,6 @@ static inline int logical_smp_processor_id(void)
	return GET_APIC_LOGICAL_ID((u32 )(APIC_BASE + APIC_LDR));		return GET_APIC_LOGICAL_ID((u32 )(APIC_BASE + APIC_LDR));
	}		}

	#include <mach_apicdef.h>
	static inline unsigned int read_apic_id(void)		static inline unsigned int read_apic_id(void)
	{		{
	unsigned int reg;		unsigned int reg;
	@@ -197,7 +198,6 @@ static inline unsigned int read_apic_id(void)
	# if defined(APIC_DEFINITION) \|\| defined(CONFIG_X86_64)		# if defined(APIC_DEFINITION) \|\| defined(CONFIG_X86_64)
	extern int hard_smp_processor_id(void);		extern int hard_smp_processor_id(void);
	# else		# else
	#include <mach_apicdef.h>
	static inline int hard_smp_processor_id(void)		static inline int hard_smp_processor_id(void)
	{		{
	/* we don't want to mark this access volatile - bad code generation */		/* we don't want to mark this access volatile - bad code generation */