diff options
| author | Andy Whitcroft <apw@shadowen.org> | 2005-06-23 00:07:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:45:05 -0700 |
| commit | 05b79bdcb48c18cd9b580c39e3efb9a1ab078151 (patch) | |
| tree | 1767aaa7a4621ff4cf1a85c2078229de54272f30 /include/asm-i386/page.h | |
| parent | d41dee369bff3b9dcb6328d4d822926c28cc2594 (diff) | |
| download | op-kernel-dev-05b79bdcb48c18cd9b580c39e3efb9a1ab078151.zip op-kernel-dev-05b79bdcb48c18cd9b580c39e3efb9a1ab078151.tar.gz | |
[PATCH] sparsemem memory model for i386
Provide the architecture specific implementation for SPARSEMEM for i386 SMP
and NUMA systems.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Dave Hansen <haveblue@us.ibm.com>
Signed-off-by: Martin Bligh <mbligh@aracnet.com>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-i386/page.h')
| -rw-r--r-- | include/asm-i386/page.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h index 8f3dded..dea8f8e 100644 --- a/include/asm-i386/page.h +++ b/include/asm-i386/page.h @@ -137,11 +137,11 @@ extern int page_is_ram(unsigned long pagenr); #define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) #define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) -#ifndef CONFIG_DISCONTIGMEM +#ifdef CONFIG_FLATMEM #define pfn_to_page(pfn) (mem_map + (pfn)) #define page_to_pfn(page) ((unsigned long)((page) - mem_map)) #define pfn_valid(pfn) ((pfn) < max_mapnr) -#endif /* !CONFIG_DISCONTIGMEM */ +#endif /* CONFIG_FLATMEM */ #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) |
