Commit 69b745ff authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc into core/percpu

parents ef3892bd e4d04071

arch/x86/include/asm/page.h

+1 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ static inline pteval_t native_pte_val(pte_t pte) 
	return pte.pte;

}



static inline pteval_t native_pte_flags(pte_t pte)

static inline pteval_t pte_flags(pte_t pte)

{

	return native_pte_val(pte) & PTE_FLAGS_MASK;

}
@@ -173,7 +173,6 @@ static inline pteval_t native_pte_flags(pte_t pte) 
#endif



#define pte_val(x)	native_pte_val(x)

#define pte_flags(x)	native_pte_flags(x)

#define __pte(x)	native_make_pte(x)



#endif	/* CONFIG_PARAVIRT */

arch/x86/include/asm/paravirt.h

+301 −152

File changed.

Preview size limit exceeded, changes collapsed.

arch/x86/include/asm/pgtable.h

+26 −12
Original line number Diff line number Diff line
@@ -240,64 +240,78 @@ static inline int pmd_large(pmd_t pte) 
		(_PAGE_PSE | _PAGE_PRESENT);

}



static inline pte_t pte_set_flags(pte_t pte, pteval_t set)

{

	pteval_t v = native_pte_val(pte);



	return native_make_pte(v | set);

}



static inline pte_t pte_clear_flags(pte_t pte, pteval_t clear)

{

	pteval_t v = native_pte_val(pte);



	return native_make_pte(v & ~clear);

}



static inline pte_t pte_mkclean(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_DIRTY);

	return pte_clear_flags(pte, _PAGE_DIRTY);

}



static inline pte_t pte_mkold(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_ACCESSED);

	return pte_clear_flags(pte, _PAGE_ACCESSED);

}



static inline pte_t pte_wrprotect(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_RW);

	return pte_clear_flags(pte, _PAGE_RW);

}



static inline pte_t pte_mkexec(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_NX);

	return pte_clear_flags(pte, _PAGE_NX);

}



static inline pte_t pte_mkdirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_DIRTY);

	return pte_set_flags(pte, _PAGE_DIRTY);

}



static inline pte_t pte_mkyoung(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_ACCESSED);

	return pte_set_flags(pte, _PAGE_ACCESSED);

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_RW);

	return pte_set_flags(pte, _PAGE_RW);

}



static inline pte_t pte_mkhuge(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_PSE);

	return pte_set_flags(pte, _PAGE_PSE);

}



static inline pte_t pte_clrhuge(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_PSE);

	return pte_clear_flags(pte, _PAGE_PSE);

}



static inline pte_t pte_mkglobal(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_GLOBAL);

	return pte_set_flags(pte, _PAGE_GLOBAL);

}



static inline pte_t pte_clrglobal(pte_t pte)

{

	return __pte(pte_val(pte) & ~_PAGE_GLOBAL);

	return pte_clear_flags(pte, _PAGE_GLOBAL);

}



static inline pte_t pte_mkspecial(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_SPECIAL);

	return pte_set_flags(pte, _PAGE_SPECIAL);

}



extern pteval_t __supported_pte_mask;

arch/x86/kernel/entry_64.S

+1 −1
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ ENTRY(native_load_gs_index) 
	CFI_STARTPROC

	pushf

	CFI_ADJUST_CFA_OFFSET 8

	DISABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI))

	DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI)

	SWAPGS

gs_change:

	movl %edi,%gs

arch/x86/kernel/paravirt.c

+41 −14

File changed.

Preview size limit exceeded, changes collapsed.