aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/include/asm/page.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-01-22 06:59:30 -0500
committerRalf Baechle <ralf@linux-mips.org>2013-02-01 04:00:22 -0500
commit7034228792cc561e79ff8600f02884bd4c80e287 (patch)
tree89b77af37d087d9de236fc5d21f60bf552d0a2c6 /arch/mips/include/asm/page.h
parent405ab01c70e18058d9c01a1256769a61fc65413e (diff)
MIPS: Whitespace cleanup.
Having received another series of whitespace patches I decided to do this once and for all rather than dealing with this kind of patches trickling in forever. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/include/asm/page.h')
-rw-r--r--arch/mips/include/asm/page.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h
index dbaec94046da..99fc547af9d3 100644
--- a/arch/mips/include/asm/page.h
+++ b/arch/mips/include/asm/page.h
@@ -31,7 +31,7 @@
31#define PAGE_SHIFT 16 31#define PAGE_SHIFT 16
32#endif 32#endif
33#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT) 33#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)
34#define PAGE_MASK (~(PAGE_SIZE - 1)) 34#define PAGE_MASK (~(PAGE_SIZE - 1))
35 35
36#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT 36#ifdef CONFIG_MIPS_HUGE_TLB_SUPPORT
37#define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3) 37#define HPAGE_SHIFT (PAGE_SHIFT + PAGE_SHIFT - 3)
@@ -95,11 +95,11 @@ extern void copy_user_highpage(struct page *to, struct page *from,
95#ifdef CONFIG_64BIT_PHYS_ADDR 95#ifdef CONFIG_64BIT_PHYS_ADDR
96 #ifdef CONFIG_CPU_MIPS32 96 #ifdef CONFIG_CPU_MIPS32
97 typedef struct { unsigned long pte_low, pte_high; } pte_t; 97 typedef struct { unsigned long pte_low, pte_high; } pte_t;
98 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32)) 98 #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32))
99 #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; }) 99 #define __pte(x) ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; })
100 #else 100 #else
101 typedef struct { unsigned long long pte; } pte_t; 101 typedef struct { unsigned long long pte; } pte_t;
102 #define pte_val(x) ((x).pte) 102 #define pte_val(x) ((x).pte)
103 #define __pte(x) ((pte_t) { (x) } ) 103 #define __pte(x) ((pte_t) { (x) } )
104 #endif 104 #endif
105#else 105#else
@@ -191,8 +191,8 @@ typedef struct { unsigned long pgprot; } pgprot_t;
191 unsigned long __pfn = (pfn); \ 191 unsigned long __pfn = (pfn); \
192 int __n = pfn_to_nid(__pfn); \ 192 int __n = pfn_to_nid(__pfn); \
193 ((__n >= 0) ? (__pfn < NODE_DATA(__n)->node_start_pfn + \ 193 ((__n >= 0) ? (__pfn < NODE_DATA(__n)->node_start_pfn + \
194 NODE_DATA(__n)->node_spanned_pages) \ 194 NODE_DATA(__n)->node_spanned_pages) \
195 : 0); \ 195 : 0); \
196}) 196})
197 197
198#endif 198#endif
@@ -206,7 +206,7 @@ extern int __virt_addr_valid(const volatile void *kaddr);
206#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ 206#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
207 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) 207 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
208 208
209#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \ 209#define UNCAC_ADDR(addr) ((addr) - PAGE_OFFSET + UNCAC_BASE + \
210 PHYS_OFFSET) 210 PHYS_OFFSET)
211#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \ 211#define CAC_ADDR(addr) ((addr) - UNCAC_BASE + PAGE_OFFSET - \
212 PHYS_OFFSET) 212 PHYS_OFFSET)