From: Joerg Roedel Date: Wed, 30 Jan 2008 12:31:08 +0000 (+0100) Subject: x86: some whitespace cleanups in paging code X-Git-Tag: v2.6.25-rc1~1143^2~637 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929fd589135ed417663f1b75b8031c9cf6687700;p=linux-2.6 x86: some whitespace cleanups in paging code This patch does some whitespace cleanups in the paging code to fix some checkpatch.pl warnings of my formerly merged cleanup patches. Signed-off-by: Joerg Roedel Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 3f8bf298db..5cadbb40da 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -226,7 +226,7 @@ __meminit void *early_ioremap(unsigned long addr, unsigned long size) vaddr += addr & ~PMD_MASK; addr &= PMD_MASK; for (i = 0; i < pmds; i++, addr += PMD_SIZE) - set_pmd(pmd + i,__pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); + set_pmd(pmd+i, __pmd(addr | __PAGE_KERNEL_LARGE_EXEC)); __flush_tlb(); return (void *)vaddr; next: diff --git a/include/asm-x86/pgtable_64.h b/include/asm-x86/pgtable_64.h index 6cf40dec09..3072619365 100644 --- a/include/asm-x86/pgtable_64.h +++ b/include/asm-x86/pgtable_64.h @@ -154,22 +154,22 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm, unsigned long #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */ #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ -#define _PAGE_PRESENT (_AC(1,UL)<<_PAGE_BIT_PRESENT) -#define _PAGE_RW (_AC(1,UL)<<_PAGE_BIT_RW) -#define _PAGE_USER (_AC(1,UL)<<_PAGE_BIT_USER) -#define _PAGE_PWT (_AC(1,UL)<<_PAGE_BIT_PWT) -#define _PAGE_PCD (_AC(1,UL)<<_PAGE_BIT_PCD) -#define _PAGE_ACCESSED (_AC(1,UL)<<_PAGE_BIT_ACCESSED) -#define _PAGE_DIRTY (_AC(1,UL)<<_PAGE_BIT_DIRTY) +#define _PAGE_PRESENT (_AC(1, UL)<<_PAGE_BIT_PRESENT) +#define _PAGE_RW (_AC(1, UL)<<_PAGE_BIT_RW) +#define _PAGE_USER (_AC(1, UL)<<_PAGE_BIT_USER) +#define _PAGE_PWT (_AC(1, UL)<<_PAGE_BIT_PWT) +#define _PAGE_PCD (_AC(1, UL)<<_PAGE_BIT_PCD) +#define _PAGE_ACCESSED (_AC(1, UL)<<_PAGE_BIT_ACCESSED) +#define _PAGE_DIRTY (_AC(1, UL)<<_PAGE_BIT_DIRTY) /* 2MB page */ -#define _PAGE_PSE (_AC(1,UL)<<_PAGE_BIT_PSE) +#define _PAGE_PSE (_AC(1, UL)<<_PAGE_BIT_PSE) /* nonlinear file mapping, saved PTE; unset:swap */ -#define _PAGE_FILE (_AC(1,UL)<<_PAGE_BIT_FILE) +#define _PAGE_FILE (_AC(1, UL)<<_PAGE_BIT_FILE) /* Global TLB entry */ -#define _PAGE_GLOBAL (_AC(1,UL)<<_PAGE_BIT_GLOBAL) +#define _PAGE_GLOBAL (_AC(1, UL)<<_PAGE_BIT_GLOBAL) #define _PAGE_PROTNONE 0x080 /* If not present */ -#define _PAGE_NX (_AC(1,UL)<<_PAGE_BIT_NX) +#define _PAGE_NX (_AC(1, UL)<<_PAGE_BIT_NX) #define _PAGE_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_USER | _PAGE_ACCESSED | _PAGE_DIRTY) #define _KERNPG_TABLE (_PAGE_PRESENT | _PAGE_RW | _PAGE_ACCESSED | _PAGE_DIRTY)