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

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

x86: move load_cr3 to a common place. 



There are currently two definitions of load_cr3, that essentially do the
same thing. This patch moves them all 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 746ff60f

include/asm-x86/mmu_context_64.h

+0 −5
Original line number Diff line number Diff line
@@ -23,11 +23,6 @@ static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 
#endif

}



static inline void load_cr3(pgd_t *pgd)

{

	asm volatile("movq %0,%%cr3" :: "r" (__pa(pgd)) : "memory");

}



static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, 

			     struct task_struct *tsk)

{

include/asm-x86/processor.h

+7 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ 


#include <asm/processor-flags.h>



#include <asm/page.h>

#include <asm/system.h>



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

					 unsigned int *ecx, unsigned int *edx)

{
@@ -15,6 +18,10 @@ static inline void native_cpuid(unsigned int *eax, unsigned int *ebx, 
		: "0" (*eax), "2" (*ecx));

}



static inline void load_cr3(pgd_t *pgdir)

{

	write_cr3(__pa(pgdir));

}



#ifdef CONFIG_X86_32

# include "processor_32.h"

include/asm-x86/processor_32.h

+0 −1
Original line number Diff line number Diff line
@@ -120,7 +120,6 @@ extern void detect_ht(struct cpuinfo_x86 *c); 
static inline void detect_ht(struct cpuinfo_x86 *c) {}

#endif



#define load_cr3(pgdir) write_cr3(__pa(pgdir))



/*

 * Save the cr4 feature set we're using (ie