openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

x86: mach_es7000 to es7000 

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu 2008-07-25 02:17:33 -07:00 committed by Ingo Molnar
parent 1176fa9192
commit c7e7964c98
11 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
arch/x86/mach-es7000/Makefile → arch/x86/es7000/Makefile
View File

0
arch/x86/mach-es7000/es7000.h → arch/x86/es7000/es7000.h
View File

0
arch/x86/mach-es7000/es7000plat.c → arch/x86/es7000/es7000plat.c
View File

2
arch/x86/mach-generic/Makefile
View File

@ -9,4 +9,4 @@ obj-$(CONFIG_X86_NUMAQ) += numaq.o
obj-$(CONFIG_X86_SUMMIT) += summit.o
obj-$(CONFIG_X86_BIGSMP) += bigsmp.o
obj-$(CONFIG_X86_ES7000) += es7000.o
obj-$(CONFIG_X86_ES7000) += ../../x86/mach-es7000/
obj-$(CONFIG_X86_ES7000) += ../../x86/es7000/

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

@ -11,12 +11,12 @@
#include <linux/kernel.h>
#include <linux/string.h>
#include <linux/init.h>
#include <asm/mach-es7000/mach_apicdef.h>
#include <asm/es7000/apicdef.h>
#include <linux/smp.h>
#include <asm/mach-es7000/mach_apic.h>
#include <asm/mach-es7000/mach_ipi.h>
#include <asm/mach-es7000/mach_mpparse.h>
#include <asm/mach-es7000/mach_wakecpu.h>
#include <asm/es7000/apic.h>
#include <asm/es7000/ipi.h>
#include <asm/es7000/mpparse.h>
#include <asm/es7000/wakecpu.h>
static int probe_es7000(void)
{

6
include/asm-x86/mach-es7000/mach_apic.h → include/asm-x86/es7000/apic.h
View File

@ -1,5 +1,5 @@
#ifndef ASM_X86__MACH_ES7000__MACH_APIC_H
#define ASM_X86__MACH_ES7000__MACH_APIC_H
#ifndef __ASM_ES7000_APIC_H
#define __ASM_ES7000_APIC_H
#define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu)
#define esr_disable (1)
@ -191,4 +191,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return cpuid_apic >> index_msb;
}
#endif /* ASM_X86__MACH_ES7000__MACH_APIC_H */
#endif /* __ASM_ES7000_APIC_H */

13
include/asm-x86/es7000/apicdef.h Normal file
View File

@ -0,0 +1,13 @@
#ifndef __ASM_ES7000_APICDEF_H
#define __ASM_ES7000_APICDEF_H
#define APIC_ID_MASK (0xFF<<24)
static inline unsigned get_apic_id(unsigned long x)
{
return (((x)>>24)&0xFF);
}
#define GET_APIC_ID(x) get_apic_id(x)
#endif

6
include/asm-x86/mach-es7000/mach_ipi.h → include/asm-x86/es7000/ipi.h
View File

@ -1,5 +1,5 @@
#ifndef ASM_X86__MACH_ES7000__MACH_IPI_H
#define ASM_X86__MACH_ES7000__MACH_IPI_H
#ifndef __ASM_ES7000_IPI_H
#define __ASM_ES7000_IPI_H
void send_IPI_mask_sequence(cpumask_t mask, int vector);
@ -21,4 +21,4 @@ static inline void send_IPI_all(int vector)
send_IPI_mask(cpu_online_map, vector);
}
#endif /* ASM_X86__MACH_ES7000__MACH_IPI_H */
#endif /* __ASM_ES7000_IPI_H */

6
include/asm-x86/mach-es7000/mach_mpparse.h → include/asm-x86/es7000/mpparse.h
View File

@ -1,5 +1,5 @@
#ifndef ASM_X86__MACH_ES7000__MACH_MPPARSE_H
#define ASM_X86__MACH_ES7000__MACH_MPPARSE_H
#ifndef __ASM_ES7000_MPPARSE_H
#define __ASM_ES7000_MPPARSE_H
#include <linux/acpi.h>
@ -26,4 +26,4 @@ static inline int es7000_check_dsdt(void)
}
#endif
#endif /* ASM_X86__MACH_ES7000__MACH_MPPARSE_H */
#endif /* __ASM_MACH_MPPARSE_H */

6
include/asm-x86/mach-es7000/mach_wakecpu.h → include/asm-x86/es7000/wakecpu.h
View File

@ -1,5 +1,5 @@
#ifndef ASM_X86__MACH_ES7000__MACH_WAKECPU_H
#define ASM_X86__MACH_ES7000__MACH_WAKECPU_H
#ifndef __ASM_ES7000_WAKECPU_H
#define __ASM_ES7000_WAKECPU_H
/*
* This file copes with machines that wakeup secondary CPUs by the
@ -56,4 +56,4 @@ static inline void restore_NMI_vector(unsigned short *high, unsigned short *low)
#define inquire_remote_apic(apicid) {}
#endif
#endif /* ASM_X86__MACH_ES7000__MACH_WAKECPU_H */
#endif /* __ASM_MACH_WAKECPU_H */

13
include/asm-x86/mach-es7000/mach_apicdef.h
View File

@ -1,13 +0,0 @@
#ifndef ASM_X86__MACH_ES7000__MACH_APICDEF_H
#define ASM_X86__MACH_ES7000__MACH_APICDEF_H
#define APIC_ID_MASK (0xFF<<24)
static inline unsigned get_apic_id(unsigned long x)
{
return (((x)>>24)&0xFF);
}
#define GET_APIC_ID(x) get_apic_id(x)
#endif /* ASM_X86__MACH_ES7000__MACH_APICDEF_H */