Commit 4b01fef8 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files

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



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

include/asm-x86/pgtable-3level.h

+28 −20
Original line number Diff line number Diff line
@@ -9,21 +9,25 @@ 
 */



#define pte_ERROR(e)							\

	printk("%s:%d: bad pte %p(%08lx%08lx).\n", __FILE__, __LINE__, &(e), (e).pte_high, (e).pte_low)

	printk("%s:%d: bad pte %p(%08lx%08lx).\n",			\

	       __FILE__, __LINE__, &(e), (e).pte_high, (e).pte_low)

#define pmd_ERROR(e)							\

	printk("%s:%d: bad pmd %p(%016Lx).\n", __FILE__, __LINE__, &(e), pmd_val(e))

	printk("%s:%d: bad pmd %p(%016Lx).\n",				\

	       __FILE__, __LINE__, &(e), pmd_val(e))

#define pgd_ERROR(e)							\

	printk("%s:%d: bad pgd %p(%016Lx).\n", __FILE__, __LINE__, &(e), pgd_val(e))



	printk("%s:%d: bad pgd %p(%016Lx).\n",				\

	       __FILE__, __LINE__, &(e), pgd_val(e))



static inline int pud_none(pud_t pud)

{

	return pud_val(pud) == 0;

}



static inline int pud_bad(pud_t pud)

{

	return (pud_val(pud) & ~(PTE_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0;

}



static inline int pud_present(pud_t pud)

{

	return pud_val(pud) & _PAGE_PRESENT;
@@ -48,7 +52,8 @@ static inline void native_set_pte(pte_t *ptep, pte_t pte) 
 * we are justified in merely clearing the PTE present bit, followed

 * by a set.  The ordering here is important.

 */

static inline void native_set_pte_present(struct mm_struct *mm, unsigned long addr,

static inline void native_set_pte_present(struct mm_struct *mm,

					  unsigned long addr,

					  pte_t *ptep, pte_t pte)

{

	ptep->pte_low = 0;
@@ -62,10 +67,12 @@ static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 
{

	set_64bit((unsigned long long *)(ptep), native_pte_val(pte));

}



static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)

{

	set_64bit((unsigned long long *)(pmdp), native_pmd_val(pmd));

}



static inline void native_set_pud(pud_t *pudp, pud_t pud)

{

	set_64bit((unsigned long long *)(pudp), native_pud_val(pud));
@@ -76,7 +83,8 @@ static inline void native_set_pud(pud_t *pudp, pud_t pud) 
 * entry, so clear the bottom half first and enforce ordering with a compiler

 * barrier.

 */

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

static inline void native_pte_clear(struct mm_struct *mm, unsigned long addr,

				    pte_t *ptep)

{

	ptep->pte_low = 0;

	smp_wmb();
@@ -107,15 +115,14 @@ static inline void pud_clear(pud_t *pudp) 
	 * current pgd to avoid unnecessary TLB flushes.

	 */

	pgd = read_cr3();

	if (__pa(pudp) >= pgd && __pa(pudp) < (pgd + sizeof(pgd_t)*PTRS_PER_PGD))

	if (__pa(pudp) >= pgd && __pa(pudp) <

	    (pgd + sizeof(pgd_t)*PTRS_PER_PGD))

		write_cr3(pgd);

}



#define pud_page(pud) \

((struct page *) __va(pud_val(pud) & PAGE_MASK))

#define pud_page(pud) ((struct page *) __va(pud_val(pud) & PAGE_MASK))



#define pud_page_vaddr(pud) \

((unsigned long) __va(pud_val(pud) & PAGE_MASK))

#define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PAGE_MASK))





/* Find an entry in the second-level page table.. */
@@ -161,7 +168,8 @@ static inline unsigned long pte_pfn(pte_t pte) 
 * put the 32 bits of offset into the high part.

 */

#define pte_to_pgoff(pte) ((pte).pte_high)

#define pgoff_to_pte(off) ((pte_t) { { .pte_low = _PAGE_FILE, .pte_high = (off) } })

#define pgoff_to_pte(off)						\

	((pte_t) { { .pte_low = _PAGE_FILE, .pte_high = (off) } })

#define PTE_FILE_MAX_BITS       32



/* Encode and de-code a swap entry */