diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:48:49 -0400 |
| commit | c3cc99ff5d24e2eeaf7ec2032e720681916990e3 (patch) | |
| tree | c3e74171bbbd2adde9d60b9db1c440415c8d2831 /include/asm-mips/page.h | |
| parent | 38ffbe66d59051fd9cfcfc8545f164700e2fa3bc (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'include/asm-mips/page.h')
| -rw-r--r-- | include/asm-mips/page.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index 494f00ba9541..fe7a88ea066e 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h | |||
| @@ -137,9 +137,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
| 137 | 137 | ||
| 138 | #endif /* !__ASSEMBLY__ */ | 138 | #endif /* !__ASSEMBLY__ */ |
| 139 | 139 | ||
| 140 | /* to align the pointer to the (next) page boundary */ | ||
| 141 | #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) | ||
| 142 | |||
| 143 | /* | 140 | /* |
| 144 | * __pa()/__va() should be used only during mem init. | 141 | * __pa()/__va() should be used only during mem init. |
| 145 | */ | 142 | */ |