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

Commit fe874b3e authored by Glauber Costa's avatar Glauber Costa Committed by Ingo Molnar
Browse files

x86: surround hard_smp_processor_id in APIC_DEFINITION 



APIC_DEFINITION is not defined in x86_64, so in practice, we keep
our old code here. But as a nice side effect, the code is now
equal to smp_32.h.

Signed-off-by: default avatarGlauber Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent fe176de0

include/asm-x86/smp_64.h

+5 −1
Original line number Diff line number Diff line
@@ -52,12 +52,16 @@ static inline int logical_smp_processor_id(void) 
	return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR));

}



# ifdef APIC_DEFINITION

extern int hard_smp_processor_id(void);

# else

#  include <mach_apicdef.h>

static inline int hard_smp_processor_id(void)

{

	/* we don't want to mark this access volatile - bad code generation */

	return GET_APIC_ID(*(u32 *)(APIC_BASE + APIC_ID));

}

# endif /* APIC_DEFINITION */



#endif