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

Commit 5b812727 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86, apic: refactor ->apic_id_mask & APIC_ID_MASK 



- spread out the namespace on a per driver basis

 - get rid of wrapper macros

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

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

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

#define __ASM_MACH_APICDEF_H



#define		APIC_ID_MASK		(0xFF<<24)

#define		BIGSMP_APIC_ID_MASK		(0xFF<<24)



static inline unsigned bigsmp_get_apic_id(unsigned long x)

{

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

+1 −1
Original line number Diff line number Diff line 
#ifndef __ASM_ES7000_APICDEF_H

#define __ASM_ES7000_APICDEF_H



#define		APIC_ID_MASK		(0xFF<<24)

#define		ES7000_APIC_ID_MASK		(0xFF<<24)



static inline unsigned int es7000_get_apic_id(unsigned long x)

{

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

+1 −2
Original line number Diff line number Diff line
@@ -4,10 +4,9 @@ 
#include <asm/apic.h>



#ifdef CONFIG_X86_64

#define	APIC_ID_MASK		(apic->apic_id_mask)

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

#else

#define		APIC_ID_MASK		(0xF<<24)

#define		DEFAULT_APIC_ID_MASK	(0x0F<<24)



static inline unsigned default_get_apic_id(unsigned long x) 

{

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

+0 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ 


#ifndef APIC_DEFINITION

#include <asm/genapic.h>



#define APIC_ID_MASK (apic->apic_id_mask)

#endif



#endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */

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

+1 −1
Original line number Diff line number Diff line 
#ifndef __ASM_NUMAQ_APICDEF_H

#define __ASM_NUMAQ_APICDEF_H



#define APIC_ID_MASK (0xF<<24)

#define NUMAQ_APIC_ID_MASK (0xF<<24)



static inline unsigned int numaq_get_apic_id(unsigned long x)

{