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

x86: mach-numaq to numaq 



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

arch/x86/mach-generic/numaq.c

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

#include <linux/string.h>

#include <linux/init.h>

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

#include <asm/numaq/apicdef.h>

#include <linux/smp.h>

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

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

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

#include <asm/mach-numaq/mach_wakecpu.h>

#include <asm/numaq/apic.h>

#include <asm/numaq/ipi.h>

#include <asm/numaq/mpparse.h>

#include <asm/numaq/wakecpu.h>

#include <asm/numaq.h>



static int mps_oem_check(struct mp_config_table *mpc, char *oem,

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

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

#define ASM_X86__MACH_NUMAQ__MACH_APIC_H

#ifndef __ASM_NUMAQ_APIC_H

#define __ASM_NUMAQ_APIC_H



#include <asm/io.h>

#include <linux/mmzone.h>
@@ -135,4 +135,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) 
	return cpuid_apic >> index_msb;

}



#endif /* ASM_X86__MACH_NUMAQ__MACH_APIC_H */
 
#endif /* __ASM_NUMAQ_APIC_H */

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

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

#define ASM_X86__MACH_NUMAQ__MACH_APICDEF_H

#ifndef __ASM_NUMAQ_APICDEF_H

#define __ASM_NUMAQ_APICDEF_H





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


#define         GET_APIC_ID(x)  get_apic_id(x)



#endif /* ASM_X86__MACH_NUMAQ__MACH_APICDEF_H */
 
#endif

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

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

#define ASM_X86__MACH_NUMAQ__MACH_IPI_H

#ifndef __ASM_NUMAQ_IPI_H

#define __ASM_NUMAQ_IPI_H



void send_IPI_mask_sequence(cpumask_t, 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_NUMAQ__MACH_IPI_H */
 
#endif /* __ASM_NUMAQ_IPI_H */

include/asm-x86/mach-numaq/mach_mpparse.h→include/asm-x86/numaq/mpparse.h

+7 −0
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H

#define ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H

#ifndef __ASM_NUMAQ_MPPARSE_H

#define __ASM_NUMAQ_MPPARSE_H



extern void numaq_mps_oem_check(struct mp_config_table *mpc, char *oem,

				char *productid);



#endif /* ASM_X86__MACH_NUMAQ__MACH_MPPARSE_H */
 
#endif /* __ASM_NUMAQ_MPPARSE_H */