提交 1f75ed0c 编写于 作者: I Ingo Molnar

x86: remove mach_apicdef.h

Move its definitions into apic.h.
Signed-off-by: NIngo Molnar <mingo@elte.hu>
上级 b2af018f
......@@ -211,4 +211,20 @@ static inline void disable_local_APIC(void) { }
#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 */
......@@ -3,7 +3,6 @@
#ifdef CONFIG_X86_LOCAL_APIC
#include <mach_apicdef.h>
#include <asm/smp.h>
#define APIC_DFR_VALUE (APIC_DFR_FLAT)
......
#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 */
#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 */
......@@ -173,6 +173,8 @@ extern int safe_smp_processor_id(void);
#endif
#include <asm/genapic.h>
#ifdef CONFIG_X86_LOCAL_APIC
#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));
}
#include <mach_apicdef.h>
static inline unsigned int read_apic_id(void)
{
unsigned int reg;
......@@ -197,7 +198,6 @@ static inline unsigned int read_apic_id(void)
# if defined(APIC_DEFINITION) || defined(CONFIG_X86_64)
extern int hard_smp_processor_id(void);
# else
#include <mach_apicdef.h>
static inline int hard_smp_processor_id(void)
{
/* we don't want to mark this access volatile - bad code generation */
......
......@@ -50,7 +50,6 @@
#include <asm/smp.h>
#include <mach_apic.h>
#include <mach_apicdef.h>
#include <mach_ipi.h>
/*
......
......@@ -19,7 +19,6 @@
#include <asm/smp.h>
#include <asm/ipi.h>
#include <asm/genapic.h>
#include <mach_apicdef.h>
#ifdef CONFIG_ACPI
#include <acpi/acpi_bus.h>
......
......@@ -64,7 +64,6 @@
#include <mach_ipi.h>
#include <mach_apic.h>
#include <mach_apicdef.h>
#define __apicdebuginit(type) static type __init
......
......@@ -30,9 +30,6 @@
#include <asm/smp.h>
#include <mach_apic.h>
#ifdef CONFIG_X86_32
#include <mach_apicdef.h>
#endif
/*
* Checksum an MP configuration block.
......
......@@ -5,7 +5,6 @@
#include <linux/threads.h>
#include <linux/cpumask.h>
#include <asm/mpspec.h>
#include <asm/mach-default/mach_apicdef.h>
#include <asm/genapic.h>
#include <asm/fixmap.h>
#include <asm/apicdef.h>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册