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

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

x86: mach_summit to summit 



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

arch/x86/kernel/summit_32.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include <linux/init.h>

#include <asm/io.h>

#include <asm/bios_ebda.h>

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

#include <asm/summit/mpparse.h>



static struct rio_table_hdr *rio_table_hdr __initdata;

static struct scal_detail   *scal_devs[MAX_NUMNODES] __initdata;

arch/x86/mach-generic/summit.c

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

#include <linux/string.h>

#include <linux/init.h>

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

#include <asm/summit/apicdef.h>

#include <linux/smp.h>

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

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

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

#include <asm/summit/apic.h>

#include <asm/summit/ipi.h>

#include <asm/summit/mpparse.h>



static int probe_summit(void)

{

include/asm-x86/mach-summit/mach_apicdef.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_SUMMIT__MACH_APICDEF_H

#define ASM_X86__MACH_SUMMIT__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_SUMMIT__MACH_APICDEF_H */

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

+12 −12
Original line number Diff line number Diff line 
#ifndef ASM_X86__MACH_SUMMIT__MACH_APIC_H

#define ASM_X86__MACH_SUMMIT__MACH_APIC_H

#ifndef __ASM_SUMMIT_APIC_H

#define __ASM_SUMMIT_APIC_H



#include <asm/smp.h>
@@ -122,7 +122,7 @@ static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_id_map) 


static inline physid_mask_t apicid_to_cpu_present(int apicid)

{

	return physid_mask_of_physid(apicid);

	return physid_mask_of_physid(0);

}



static inline void setup_portio_remap(void)
@@ -182,4 +182,4 @@ static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) 
	return hard_smp_processor_id() >> index_msb;

}



#endif /* ASM_X86__MACH_SUMMIT__MACH_APIC_H */
 
#endif /* __ASM_SUMMIT_APIC_H */

include/asm-x86/summit/apicdef.h

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SUMMIT_APICDEF_H

#define __ASM_SUMMIT_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