diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2009-07-03 02:11:15 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2009-07-03 10:45:29 -0400 |
commit | baf922780251d12bc1c24c83df60c4c278abb745 (patch) | |
tree | d18b24f58763d7b13dd37e4d9c70b2b99e845b18 /arch | |
parent | 01a6221a6a51ec47b9ae3ed42c396f98dd488c7e (diff) |
MIPS: Fix CONFIG_FLATMEM version of pfn_valid()
For systems which do not define PHYS_OFFSET as 0 pfn_valid() may falsely
have returned 0 on most configurations. Bug introduced by commit
752fbeb2e3555c0d236e992f1195fd7ce30e728d (linux-mips.org) rsp.
6f284a2ce7b8bc49cb8455b1763357897a899abb (kernel.org) titled "[MIPS]
FLATMEM: introduce PHYS_OFFSET."
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/include/asm/page.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/include/asm/page.h b/arch/mips/include/asm/page.h index dc0eaa731281..96a14a426a7c 100644 --- a/arch/mips/include/asm/page.h +++ b/arch/mips/include/asm/page.h | |||
@@ -165,7 +165,14 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
165 | 165 | ||
166 | #ifdef CONFIG_FLATMEM | 166 | #ifdef CONFIG_FLATMEM |
167 | 167 | ||
168 | #define pfn_valid(pfn) ((pfn) >= ARCH_PFN_OFFSET && (pfn) < max_mapnr) | 168 | #define pfn_valid(pfn) \ |
169 | ({ \ | ||
170 | unsigned long __pfn = (pfn); \ | ||
171 | /* avoid <linux/bootmem.h> include hell */ \ | ||
172 | extern unsigned long min_low_pfn; \ | ||
173 | \ | ||
174 | __pfn >= min_low_pfn && __pfn < max_mapnr; \ | ||
175 | }) | ||
169 | 176 | ||
170 | #elif defined(CONFIG_SPARSEMEM) | 177 | #elif defined(CONFIG_SPARSEMEM) |
171 | 178 | ||