aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2008-01-30 13:30:37 +0100
committerIngo Molnar <mingo@elte.hu>2008-01-30 13:30:37 +0100
commit4757d7d8d00c5f8b2c176ca03b0a8eabbc206664 (patch)
treec362ddaf7c19fdf3703d414ad9f078a47790352f /include
parent0b80fc721bed2635c7f0b198e1c862a4596dc2cd (diff)
x86: put all kern_addr_valid() incarnations to pgtable.h
Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/mmzone_32.h3
-rw-r--r--include/asm-x86/pgtable_32.h8
-rw-r--r--include/asm-x86/sparsemem_32.h3
3 files changed, 7 insertions, 7 deletions
diff --git a/include/asm-x86/mmzone_32.h b/include/asm-x86/mmzone_32.h
index 118e9812778..5d6f4ce6e6d 100644
--- a/include/asm-x86/mmzone_32.h
+++ b/include/asm-x86/mmzone_32.h
@@ -87,9 +87,6 @@ static inline int pfn_to_nid(unsigned long pfn)
__pgdat->node_start_pfn + __pgdat->node_spanned_pages; \
})
-/* XXX: FIXME -- wli */
-#define kern_addr_valid(kaddr) (0)
-
#ifdef CONFIG_X86_NUMAQ /* we have contiguous memory on NUMA-Q */
#define pfn_valid(pfn) ((pfn) < num_physpages)
#else
diff --git a/include/asm-x86/pgtable_32.h b/include/asm-x86/pgtable_32.h
index ed3e70d8d04..a8be1ee15a9 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/include/asm-x86/pgtable_32.h
@@ -497,9 +497,15 @@ static inline void paravirt_pagetable_setup_done(pgd_t *base)
#endif /* !__ASSEMBLY__ */
+/*
+ * kern_addr_valid() is (1) for FLATMEM and (0) for
+ * SPARSEMEM and DISCONTIGMEM
+ */
#ifdef CONFIG_FLATMEM
#define kern_addr_valid(addr) (1)
-#endif /* CONFIG_FLATMEM */
+#else
+#define kern_addr_valid(kaddr) (0)
+#endif
#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
remap_pfn_range(vma, vaddr, pfn, size, prot)
diff --git a/include/asm-x86/sparsemem_32.h b/include/asm-x86/sparsemem_32.h
index cfeed990585..d89c3210059 100644
--- a/include/asm-x86/sparsemem_32.h
+++ b/include/asm-x86/sparsemem_32.h
@@ -24,8 +24,5 @@
#define MAX_PHYSMEM_BITS 32
#endif
-/* XXX: FIXME -- wli */
-#define kern_addr_valid(kaddr) (0)
-
#endif /* CONFIG_SPARSEMEM */
#endif /* _I386_SPARSEMEM_H */