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

Commit 751de83c authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify msr smp funcs 



The functions under #ifdef CONFIG_SMP in msr.h are the same
for both x86_64 and i386, and this patches removes one of them,
putting them in a single location

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent fe58fc8f

include/asm-x86/msr.h

+7 −26
Original line number Diff line number Diff line
@@ -139,29 +139,6 @@ static inline int wrmsr_safe(u32 __msr, u32 __low, u32 __high) 
	} while(0)

#endif	/* !CONFIG_PARAVIRT */



#ifdef CONFIG_SMP

void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);

void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);

int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);

int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);

#else  /*  CONFIG_SMP  */

static inline void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)

{

	rdmsr(msr_no, *l, *h);

}

static inline void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)

{

	wrmsr(msr_no, l, h);

}

static inline int rdmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h)

{

	return rdmsr_safe(msr_no, l, h);

}

static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h)

{

	return wrmsr_safe(msr_no, l, h);

}

#endif  /*  CONFIG_SMP  */

#endif  /* ! __ASSEMBLY__ */

#endif  /* __KERNEL__ */
@@ -327,6 +304,12 @@ static inline unsigned int cpuid_edx(unsigned int op) 
			:"c"(msr), "i"(-EIO), "0"(0));			\

	  ret__; })



#endif  /* __ASSEMBLY__ */



#endif  /* !__i386__ */



#ifndef __ASSEMBLY__



#ifdef CONFIG_SMP

void rdmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 *l, u32 *h);

void wrmsr_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h);
@@ -353,6 +336,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) 
#endif  /* __KERNEL__ */

#endif /* __ASSEMBLY__ */



#endif  /* !__i386__ */



#endif