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

Commit 0ccb8acc authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: unify current_text_addr 



current_text_addr() has a different implementation in x86_64 and
i386, but it is not fundamentally different. I stick to the i386
implementation, that seem to be a common base, and move it to processor.h

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 683e0253

include/asm-x86/processor.h

+11 −0
Original line number Diff line number Diff line
@@ -10,6 +10,17 @@ struct mm_struct; 
#include <asm/page.h>

#include <asm/system.h>



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

static inline void *current_text_addr(void)

{

	void *pc;

	asm volatile("mov $1f,%0\n1:":"=r" (pc));

	return pc;

}



static inline void native_cpuid(unsigned int *eax, unsigned int *ebx,

					 unsigned int *ecx, unsigned int *edx)

{

include/asm-x86/processor_32.h

+0 −6
Original line number Diff line number Diff line
@@ -21,12 +21,6 @@ 
#include <linux/init.h>

#include <asm/desc_defs.h>



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

#define current_text_addr() ({ void *pc; __asm__("movl $1f,%0\n1:":"=g" (pc)); pc; })



/*

 *  CPU type and hardware bug flags. Kept separately for each CPU.

 *  Members of this structure are referenced in head.S, so think twice

include/asm-x86/processor_64.h

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
#include <linux/cpumask.h>

#include <asm/desc_defs.h>



/*

 * Default implementation of macro that returns current

 * instruction pointer ("program counter").

 */

#define current_text_addr() ({ void *pc; asm volatile("leaq 1f(%%rip),%0\n1:":"=r"(pc)); pc; })



/*

 *  CPU type and hardware bug flags. Kept separately for each CPU.

 */