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

Commit 1176fa91 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: mach-bigsmp to bigsmp 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a4dbc34d

arch/x86/mach-generic/bigsmp.c

+3 −3
Original line number Diff line number Diff line
@@ -12,10 +12,10 @@ 
#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/dmi.h>

#include <asm/mach-bigsmp/mach_apicdef.h>

#include <asm/bigsmp/apicdef.h>

#include <linux/smp.h>

#include <asm/mach-bigsmp/mach_apic.h>

#include <asm/mach-bigsmp/mach_ipi.h>

#include <asm/bigsmp/apic.h>

#include <asm/bigsmp/ipi.h>

#include <asm/mach-default/mach_mpparse.h>



static int dmi_bigsmp; /* can be set by dmi scanners */

include/asm-x86/mach-bigsmp/mach_apic.h→include/asm-x86/bigsmp/apic.h

+5 −5
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_BIGSMP__MACH_APIC_H

#define ASM_X86__MACH_BIGSMP__MACH_APIC_H

#ifndef __ASM_MACH_APIC_H

#define __ASM_MACH_APIC_H



#define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu))

#define esr_disable (1)
@@ -141,4 +141,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) 
	return cpuid_apic >> index_msb;

}



#endif /* ASM_X86__MACH_BIGSMP__MACH_APIC_H */
 
#endif /* __ASM_MACH_APIC_H */

include/asm-x86/mach-bigsmp/mach_apicdef.h→include/asm-x86/bigsmp/apicdef.h

+13 −0
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_BIGSMP__MACH_APICDEF_H

#define ASM_X86__MACH_BIGSMP__MACH_APICDEF_H

#ifndef __ASM_MACH_APICDEF_H

#define __ASM_MACH_APICDEF_H



#define		APIC_ID_MASK		(0xFF<<24)
@@ -10,4 +10,4 @@ static inline unsigned get_apic_id(unsigned long x) 


#define		GET_APIC_ID(x)	get_apic_id(x)



#endif /* ASM_X86__MACH_BIGSMP__MACH_APICDEF_H */
 
#endif

include/asm-x86/mach-bigsmp/mach_ipi.h→include/asm-x86/bigsmp/ipi.h

+3 −3
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_BIGSMP__MACH_IPI_H

#define ASM_X86__MACH_BIGSMP__MACH_IPI_H

#ifndef __ASM_MACH_IPI_H

#define __ASM_MACH_IPI_H



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);

}



#endif /* ASM_X86__MACH_BIGSMP__MACH_IPI_H */
 
#endif /* __ASM_MACH_IPI_H */