x86: mach-bigsmp to bigsmp

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:21 -07:00 committed by Ingo Molnar
parent a4dbc34d18
commit 1176fa9192
5 changed files with 24 additions and 24 deletions

View File

@ -12,10 +12,10 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <asm/mach-bigsmp/mach_apicdef.h> #include <asm/bigsmp/apicdef.h>
#include <linux/smp.h> #include <linux/smp.h>
#include <asm/mach-bigsmp/mach_apic.h> #include <asm/bigsmp/apic.h>
#include <asm/mach-bigsmp/mach_ipi.h> #include <asm/bigsmp/ipi.h>
#include <asm/mach-default/mach_mpparse.h> #include <asm/mach-default/mach_mpparse.h>
static int dmi_bigsmp; /* can be set by dmi scanners */ static int dmi_bigsmp; /* can be set by dmi scanners */

View File

@ -1,5 +1,5 @@
#ifndef ASM_X86__MACH_BIGSMP__MACH_APIC_H #ifndef __ASM_MACH_APIC_H
#define ASM_X86__MACH_BIGSMP__MACH_APIC_H #define __ASM_MACH_APIC_H
#define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu)) #define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))
#define esr_disable (1) #define esr_disable (1)
@ -11,7 +11,7 @@ static inline int apic_id_registered(void)
/* Round robin the irqs amoung the online cpus */ /* Round robin the irqs amoung the online cpus */
static inline cpumask_t target_cpus(void) static inline cpumask_t target_cpus(void)
{ {
static unsigned long cpu = NR_CPUS; static unsigned long cpu = NR_CPUS;
do { do {
if (cpu >= NR_CPUS) if (cpu >= NR_CPUS)
@ -23,7 +23,7 @@ static inline cpumask_t target_cpus(void)
} }
#undef APIC_DEST_LOGICAL #undef APIC_DEST_LOGICAL
#define APIC_DEST_LOGICAL 0 #define APIC_DEST_LOGICAL 0
#define TARGET_CPUS (target_cpus()) #define TARGET_CPUS (target_cpus())
#define APIC_DFR_VALUE (APIC_DFR_FLAT) #define APIC_DFR_VALUE (APIC_DFR_FLAT)
#define INT_DELIVERY_MODE (dest_Fixed) #define INT_DELIVERY_MODE (dest_Fixed)
@ -141,4 +141,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb)
return cpuid_apic >> index_msb; return cpuid_apic >> index_msb;
} }
#endif /* ASM_X86__MACH_BIGSMP__MACH_APIC_H */ #endif /* __ASM_MACH_APIC_H */

View File

@ -0,0 +1,13 @@
#ifndef __ASM_MACH_APICDEF_H
#define __ASM_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

View File

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

View File

@ -1,13 +0,0 @@
#ifndef ASM_X86__MACH_BIGSMP__MACH_APICDEF_H
#define ASM_X86__MACH_BIGSMP__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_BIGSMP__MACH_APICDEF_H */