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

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



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

include/asm-x86/pgtable_32.h

+53 −49
Original line number Diff line number Diff line
@@ -59,15 +59,16 @@ void paging_init(void); 
 * area for the same reason. ;)

 */

#define VMALLOC_OFFSET	(8 * 1024 * 1024)

#define VMALLOC_START	(((unsigned long) high_memory + \

			2*VMALLOC_OFFSET-1) & ~(VMALLOC_OFFSET-1))

#define VMALLOC_START	(((unsigned long)high_memory + 2 * VMALLOC_OFFSET - 1) \

			 & ~(VMALLOC_OFFSET - 1))

#ifdef CONFIG_X86_PAE

#define LAST_PKMAP 512

#else

#define LAST_PKMAP 1024

#endif



#define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE*(LAST_PKMAP + 1)) & PMD_MASK)

#define PKMAP_BASE ((FIXADDR_BOOT_START - PAGE_SIZE * (LAST_PKMAP + 1))	\

		    & PMD_MASK)



#ifdef CONFIG_HIGHMEM

# define VMALLOC_END	(PKMAP_BASE - 2 * PAGE_SIZE)
@@ -88,16 +89,16 @@ extern unsigned long pg0[]; 
#define pte_present(x)	((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE))



/* To avoid harmful races, pmd_none(x) should check only the lower when PAE */

#define pmd_none(x)	(!(unsigned long)pmd_val(x))

#define pmd_present(x)	(pmd_val(x) & _PAGE_PRESENT)

#define pmd_none(x)	(!(unsigned long)pmd_val((x)))

#define pmd_present(x)	(pmd_val((x)) & _PAGE_PRESENT)



extern int pmd_bad(pmd_t pmd);



#define pmd_bad_v1(x)	((pmd_val(x) & (~PAGE_MASK & ~_PAGE_USER)) != _KERNPG_TABLE)

#define	pmd_bad_v2(x)	((pmd_val(x) \

			  & ~(PAGE_MASK | _PAGE_USER | _PAGE_PSE | _PAGE_NX)) \

			 != _KERNPG_TABLE)



#define pmd_bad_v1(x)							\

	(_KERNPG_TABLE != (pmd_val((x)) & ~(PAGE_MASK | _PAGE_USER)))

#define	pmd_bad_v2(x)							\

	(_KERNPG_TABLE != (pmd_val((x)) & ~(PAGE_MASK | _PAGE_USER |	\

					    _PAGE_PSE | _PAGE_NX)))



#define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT))
@@ -123,17 +124,18 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) 
}



/*

 * Macro to mark a page protection value as "uncacheable".  On processors which do not support

 * it, this is a no-op.

 * Macro to mark a page protection value as "uncacheable".

 * On processors which do not support it, this is a no-op.

 */

#define pgprot_noncached(prot)	((boot_cpu_data.x86 > 3)					  \

				 ? (__pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT)) : (prot))

#define pgprot_noncached(prot)					\

	((boot_cpu_data.x86 > 3)				\

	 ? (__pgprot(pgprot_val(prot) | _PAGE_PCD | _PAGE_PWT))	\

	 : (prot))



/*

 * Conversion functions: convert a page and protection to a page entry,

 * and a page entry and page directory to the page they refer to.

 */



#define mk_pte(page, pgprot)	pfn_pte(page_to_pfn(page), (pgprot))



/*
@@ -143,19 +145,19 @@ static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) 
 * control the given virtual address

 */

#define pgd_index(address) (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1))

#define pgd_index_k(addr) pgd_index(addr)

#define pgd_index_k(addr) pgd_index((addr))



/*

 * pgd_offset() returns a (pgd_t *)

 * pgd_index() is used get the offset into the pgd page's array of pgd_t's;

 */

#define pgd_offset(mm, address) ((mm)->pgd+pgd_index(address))

#define pgd_offset(mm, address) ((mm)->pgd + pgd_index((address)))



/*

 * a shortcut which implies the use of the kernel's pgd, instead

 * of a process's

 */

#define pgd_offset_k(address) pgd_offset(&init_mm, address)

#define pgd_offset_k(address) pgd_offset(&init_mm, (address))



static inline int pud_large(pud_t pud) { return 0; }
@@ -177,24 +179,26 @@ static inline int pud_large(pud_t pud) { return 0; } 
#define pte_index(address)					\

	(((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1))

#define pte_offset_kernel(dir, address)				\

	((pte_t *) pmd_page_vaddr(*(dir)) +  pte_index(address))

	((pte_t *)pmd_page_vaddr(*(dir)) +  pte_index((address)))



#define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))

#define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT))



#define pmd_page_vaddr(pmd)					\

		((unsigned long) __va(pmd_val(pmd) & PAGE_MASK))

	((unsigned long)__va(pmd_val((pmd)) & PAGE_MASK))



#if defined(CONFIG_HIGHPTE)

#define pte_offset_map(dir, address)					\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + pte_index(address))

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) +		\

	 pte_index((address)))

#define pte_offset_map_nested(dir, address)				\

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE1) + pte_index(address))

#define pte_unmap(pte) kunmap_atomic(pte, KM_PTE0)

#define pte_unmap_nested(pte) kunmap_atomic(pte, KM_PTE1)

	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE1) +		\

	 pte_index((address)))

#define pte_unmap(pte) kunmap_atomic((pte), KM_PTE0)

#define pte_unmap_nested(pte) kunmap_atomic((pte), KM_PTE1)

#else

#define pte_offset_map(dir, address)					\

	((pte_t *)page_address(pmd_page(*(dir))) + pte_index(address))

#define pte_offset_map_nested(dir, address) pte_offset_map(dir, address)

	((pte_t *)page_address(pmd_page(*(dir))) + pte_index((address)))

#define pte_offset_map_nested(dir, address) pte_offset_map((dir), (address))

#define pte_unmap(pte) do { } while (0)

#define pte_unmap_nested(pte) do { } while (0)

#endif
@@ -202,8 +206,8 @@ static inline int pud_large(pud_t pud) { return 0; } 
/* Clear a kernel PTE and flush it from the TLB */

#define kpte_clear_flush(ptep, vaddr)		\

do {						\

	pte_clear(&init_mm, vaddr, ptep);				\

	__flush_tlb_one(vaddr);						\

	pte_clear(&init_mm, (vaddr), (ptep));	\

	__flush_tlb_one((vaddr));		\

} while (0)



/*