Commit 3cbaeafe authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files

include/asm-x86/pgtable.h: checkpatch cleanups - formatting only 



Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 7f94401e

include/asm-x86/pgtable.h

+120 −36
Original line number Diff line number Diff line
@@ -48,12 +48,15 @@ 
#endif



/* If _PAGE_PRESENT is clear, we use these: */

#define _PAGE_FILE	_PAGE_DIRTY	/* nonlinear file mapping, saved PTE; unset:swap */

#define _PAGE_FILE	_PAGE_DIRTY	/* nonlinear file mapping,

					 * saved PTE; unset:swap */

#define _PAGE_PROTNONE	_PAGE_PSE	/* if the user mapped it with PROT_NONE;

					   pte_present gives true */



#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)

#define _PAGE_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER |	\

			 _PAGE_ACCESSED | _PAGE_DIRTY)

#define _KERNPG_TABLE	(_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED |	\

			 _PAGE_DIRTY)



#define _PAGE_CHG_MASK	(PTE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY)
@@ -64,14 +67,20 @@ 
#define _PAGE_CACHE_UC		(_PAGE_PCD | _PAGE_PWT)



#define PAGE_NONE	__pgprot(_PAGE_PROTNONE | _PAGE_ACCESSED)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)



#define PAGE_SHARED_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY_NOEXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_COPY_EXEC		__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | \

				 _PAGE_ACCESSED | _PAGE_NX)



#define PAGE_SHARED_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_RW |	\

					 _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_COPY_NOEXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER |	\

					 _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_COPY_EXEC		__pgprot(_PAGE_PRESENT | _PAGE_USER |	\

					 _PAGE_ACCESSED)

#define PAGE_COPY		PAGE_COPY_NOEXEC

#define PAGE_READONLY		__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_READONLY_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_ACCESSED)

#define PAGE_READONLY		__pgprot(_PAGE_PRESENT | _PAGE_USER |	\

					 _PAGE_ACCESSED | _PAGE_NX)

#define PAGE_READONLY_EXEC	__pgprot(_PAGE_PRESENT | _PAGE_USER |	\

					 _PAGE_ACCESSED)



#ifdef CONFIG_X86_32

#define _PAGE_KERNEL_EXEC \
@@ -152,30 +161,101 @@ extern struct list_head pgd_list; 
 * The following only work if pte_present() is true.

 * Undefined behaviour if not..

 */

static inline int pte_dirty(pte_t pte)		{ return pte_val(pte) & _PAGE_DIRTY; }

static inline int pte_young(pte_t pte)		{ return pte_val(pte) & _PAGE_ACCESSED; }

static inline int pte_write(pte_t pte)		{ return pte_val(pte) & _PAGE_RW; }

static inline int pte_file(pte_t pte)		{ return pte_val(pte) & _PAGE_FILE; }

static inline int pte_huge(pte_t pte)		{ return pte_val(pte) & _PAGE_PSE; }

static inline int pte_global(pte_t pte) 	{ return pte_val(pte) & _PAGE_GLOBAL; }

static inline int pte_exec(pte_t pte)		{ return !(pte_val(pte) & _PAGE_NX); }



static inline int pmd_large(pmd_t pte) {

static inline int pte_dirty(pte_t pte)

{

	return pte_val(pte) & _PAGE_DIRTY;

}



static inline int pte_young(pte_t pte)

{

	return pte_val(pte) & _PAGE_ACCESSED;

}



static inline int pte_write(pte_t pte)

{

	return pte_val(pte) & _PAGE_RW;

}



static inline int pte_file(pte_t pte)

{

	return pte_val(pte) & _PAGE_FILE;

}



static inline int pte_huge(pte_t pte)

{

	return pte_val(pte) & _PAGE_PSE;

}



static inline int pte_global(pte_t pte)

{

	return pte_val(pte) & _PAGE_GLOBAL;

}



static inline int pte_exec(pte_t pte)

{

	return !(pte_val(pte) & _PAGE_NX);

}



static inline int pmd_large(pmd_t pte)

{

	return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) ==

		(_PAGE_PSE | _PAGE_PRESENT);

}



static inline pte_t pte_mkclean(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_DIRTY); }

static inline pte_t pte_mkold(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_ACCESSED); }

static inline pte_t pte_wrprotect(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_RW); }

static inline pte_t pte_mkexec(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_NX); }

static inline pte_t pte_mkdirty(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_DIRTY); }

static inline pte_t pte_mkyoung(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_ACCESSED); }

static inline pte_t pte_mkwrite(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_RW); }

static inline pte_t pte_mkhuge(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_PSE); }

static inline pte_t pte_clrhuge(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_PSE); }

static inline pte_t pte_mkglobal(pte_t pte)	{ return __pte(pte_val(pte) | _PAGE_GLOBAL); }

static inline pte_t pte_clrglobal(pte_t pte)	{ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_GLOBAL); }

static inline pte_t pte_mkclean(pte_t pte)

{

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

}



static inline pte_t pte_mkold(pte_t pte)

{

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

}



static inline pte_t pte_wrprotect(pte_t pte)

{

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

}



static inline pte_t pte_mkexec(pte_t pte)

{

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

}



static inline pte_t pte_mkdirty(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_DIRTY);

}



static inline pte_t pte_mkyoung(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_ACCESSED);

}



static inline pte_t pte_mkwrite(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_RW);

}



static inline pte_t pte_mkhuge(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_PSE);

}



static inline pte_t pte_clrhuge(pte_t pte)

{

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

}



static inline pte_t pte_mkglobal(pte_t pte)

{

	return __pte(pte_val(pte) | _PAGE_GLOBAL);

}



static inline pte_t pte_clrglobal(pte_t pte)

{

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

}



extern pteval_t __supported_pte_mask;
@@ -342,7 +422,8 @@ static inline void native_set_pte_at(struct mm_struct *mm, unsigned long addr, 
})



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR

static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr,

				       pte_t *ptep)

{

	pte_t pte = native_ptep_get_and_clear(ptep);

	pte_update(mm, addr, ptep);
@@ -350,7 +431,9 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
}



#define __HAVE_ARCH_PTEP_GET_AND_CLEAR_FULL

static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long addr, pte_t *ptep, int full)

static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,

					    unsigned long addr, pte_t *ptep,

					    int full)

{

	pte_t pte;

	if (full) {
@@ -366,7 +449,8 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long 
}



#define __HAVE_ARCH_PTEP_SET_WRPROTECT

static inline void ptep_set_wrprotect(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

static inline void ptep_set_wrprotect(struct mm_struct *mm,

				      unsigned long addr, pte_t *ptep)

{

	clear_bit(_PAGE_BIT_RW, (unsigned long *)&ptep->pte);

	pte_update(mm, addr, ptep);