aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-i386/page.h
diff options
context:
space:
mode:
authorAndy Whitcroft <apw@shadowen.org>2005-06-23 03:07:57 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-23 12:45:05 -0400
commit05b79bdcb48c18cd9b580c39e3efb9a1ab078151 (patch)
tree1767aaa7a4621ff4cf1a85c2078229de54272f30 /include/asm-i386/page.h
parentd41dee369bff3b9dcb6328d4d822926c28cc2594 (diff)
[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.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-i386/page.h b/include/asm-i386/page.h
index 8f3dded01bff..dea8f8e6d86e 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);
137#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET) 137#define __pa(x) ((unsigned long)(x)-PAGE_OFFSET)
138#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET)) 138#define __va(x) ((void *)((unsigned long)(x)+PAGE_OFFSET))
139#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) 139#define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT)
140#ifndef CONFIG_DISCONTIGMEM 140#ifdef CONFIG_FLATMEM
141#define pfn_to_page(pfn) (mem_map + (pfn)) 141#define pfn_to_page(pfn) (mem_map + (pfn))
142#define page_to_pfn(page) ((unsigned long)((page) - mem_map)) 142#define page_to_pfn(page) ((unsigned long)((page) - mem_map))
143#define pfn_valid(pfn) ((pfn) < max_mapnr) 143#define pfn_valid(pfn) ((pfn) < max_mapnr)
144#endif /* !CONFIG_DISCONTIGMEM */ 144#endif /* CONFIG_FLATMEM */
145#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) 145#define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
146 146
147#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) 147#define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT)