[PATCH] on parisc CONFIG_DISCONTIGMEM always depends on CONFIG_64BIT
From: Christoph Egger
Date: Wed May 12 2010 - 10:59:24 EST
Removing a conditional on 64BIT inside a DISCONTIGMEM block inside
arch/parisc. DISCONTIGMEM depends on ARCH_DISCONTIGMEM_ENABLE either
directly or through DISCONTIGMEM_MANUAL which in turn depends on 64BIT
inside Kconfig so the check and the else case isn't needed at all (the
else case can't ever be reached)
Signed-off-by: Christoph Egger <siccegge@xxxxxxxxx>
---
arch/parisc/include/asm/mmzone.h | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/arch/parisc/include/asm/mmzone.h b/arch/parisc/include/asm/mmzone.h
index 9608d2c..dbddcac 100644
--- a/arch/parisc/include/asm/mmzone.h
+++ b/arch/parisc/include/asm/mmzone.h
@@ -35,12 +35,7 @@ extern struct node_map_data node_data[];
#define PFNNID_MAP_MAX 512 /* support 512GB */
extern unsigned char pfnnid_map[PFNNID_MAP_MAX];
-#ifndef CONFIG_64BIT
#define pfn_is_io(pfn) ((pfn & (0xf0000000UL >> PAGE_SHIFT)) == (0xf0000000UL >> PAGE_SHIFT))
-#else
-/* io can be 0xf0f0f0f0f0xxxxxx or 0xfffffffff0000000 */
-#define pfn_is_io(pfn) ((pfn & (0xf000000000000000UL >> PAGE_SHIFT)) == (0xf000000000000000UL >> PAGE_SHIFT))
-#endif
static inline int pfn_to_nid(unsigned long pfn)
{
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/