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

Commit 94af1875 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: get rid of *_APIC_ID_MASK definitions 



Impact: cleanup

Remove the *_APIC_ID_MASK subarch definitions and move them straight
to the genapic driver initialization code.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 5b812727

arch/x86/include/asm/bigsmp/apicdef.h

+0 −2
Original line number Diff line number Diff line 
#ifndef __ASM_MACH_APICDEF_H

#define __ASM_MACH_APICDEF_H



#define		BIGSMP_APIC_ID_MASK		(0xFF<<24)



static inline unsigned bigsmp_get_apic_id(unsigned long x)

{

	return (x >> 24) & 0xFF;

arch/x86/include/asm/es7000/apicdef.h

+0 −2
Original line number Diff line number Diff line 
#ifndef __ASM_ES7000_APICDEF_H

#define __ASM_ES7000_APICDEF_H



#define		ES7000_APIC_ID_MASK		(0xFF<<24)



static inline unsigned int es7000_get_apic_id(unsigned long x)

{

	return (x >> 24) & 0xFF;

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

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ 
#ifdef CONFIG_X86_64

#define	SET_APIC_ID(x)		(apic->set_apic_id(x))

#else

#define		DEFAULT_APIC_ID_MASK	(0x0F<<24)



static inline unsigned default_get_apic_id(unsigned long x) 

{

arch/x86/include/asm/numaq/apicdef.h

+0 −2
Original line number Diff line number Diff line 
#ifndef __ASM_NUMAQ_APICDEF_H

#define __ASM_NUMAQ_APICDEF_H



#define NUMAQ_APIC_ID_MASK (0xF<<24)



static inline unsigned int numaq_get_apic_id(unsigned long x)

{

	return (x >> 24) & 0x0F;

arch/x86/include/asm/summit/apicdef.h

+0 −2
Original line number Diff line number Diff line 
#ifndef __ASM_SUMMIT_APICDEF_H

#define __ASM_SUMMIT_APICDEF_H



#define		SUMMIT_APIC_ID_MASK		(0xFF<<24)



static inline unsigned summit_get_apic_id(unsigned long x)

{

	return (x >> 24) & 0xFF;