diff options
| author | Chad Reese <creese@caviumnetworks.com> | 2006-05-31 02:16:49 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-06 01:15:20 +0200 |
| commit | b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0 (patch) | |
| tree | 940184596b217cfe65948e8e29d91025e3657d47 /include/asm-mips/page.h | |
| parent | [MIPS] Fix compiler warnings (field width, unused variable) (diff) | |
| download | linux-b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0.tar.xz linux-b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0.zip | |
[MIPS] Fix sparsemem support.
Move memory_present() in arch/mips/kernel/setup.c. When using sparsemem
extreme, this function does an allocate for bootmem. This would always
fail since init_bootmem hasn't been called yet.
Move memory_present after free_bootmem. This only marks actual memory
ranges as present instead of the entire address space.
Signed-off-by: Chad Reese <creese@caviumnetworks.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'include/asm-mips/page.h')
| -rw-r--r-- | include/asm-mips/page.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index a1eab136ff6c..4035ec79ecd4 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -139,9 +139,11 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) +#ifndef CONFIG_SPARSEMEM #ifndef CONFIG_NEED_MULTIPLE_NODES #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif +#endif #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) |