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

Commit 58d5fa7a authored by Siddha, Suresh B's avatar Siddha, Suresh B Committed by Thomas Gleixner
Browse files

i386: fix 4 bit apicid assumption of mach-default 



Fix get_apic_id() in mach-default, so that it uses 8 bits incase of
xAPIC case and 4 bits for legacy APIC case.

This fixes the i386 kernel assumption that apic id is less than 16 for
xAPIC platforms with 8 cpus or less and makes the kernel boot on such
platforms.

[ tglx: arch/x86 adaptation ]

Signed-off-by: default avatarSuresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Cc: Andi Kleen <ak@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 801916c1

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

+7 −1
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_APICDEF_H

#define __ASM_MACH_APICDEF_H



#include <asm/apic.h>



#define		APIC_ID_MASK		(0xF<<24)



static inline unsigned get_apic_id(unsigned long x) 

{ 

	unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));

	if (APIC_XAPIC(ver))

		return (((x)>>24)&0xFF);

	else

		return (((x)>>24)&0xF);

}