From e292921f24ff0411b3b7f2d7a81346c4e312a816 Mon Sep 17 00:00:00 2001
From: Ken'ichi Ohmichi <oomichi@mxs.nes.nec.co.jp>
Date: Wed, 29 Oct 2008 14:17:57 -0700
Subject: [PATCH] --- yaml --- r: 118589 b: refs/heads/master c:
 aca14f33104bb7b101df23cdd36c520b7c66bcfd h: refs/heads/master i:   118587:
 d14bbdd07b626516259ae31123acce3f5ae13046 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/ia64/include/asm/meminit.h | 1 -
 trunk/arch/ia64/mm/discontig.c        | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f7a90fb14ce1..1fda1ab6ad13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d6e15199d1784df90b7535e625f7617bd343d202
+refs/heads/master: aca14f33104bb7b101df23cdd36c520b7c66bcfd
diff --git a/trunk/arch/ia64/include/asm/meminit.h b/trunk/arch/ia64/include/asm/meminit.h
index 6bc96ee54327..c0cea375620a 100644
--- a/trunk/arch/ia64/include/asm/meminit.h
+++ b/trunk/arch/ia64/include/asm/meminit.h
@@ -48,7 +48,6 @@ extern int reserve_elfcorehdr(unsigned long *start, unsigned long *end);
  */
 #define GRANULEROUNDDOWN(n)	((n) & ~(IA64_GRANULE_SIZE-1))
 #define GRANULEROUNDUP(n)	(((n)+IA64_GRANULE_SIZE-1) & ~(IA64_GRANULE_SIZE-1))
-#define ORDERROUNDDOWN(n)	((n) & ~((PAGE_SIZE<<MAX_ORDER)-1))
 
 #ifdef CONFIG_NUMA
   extern void call_pernode_memory (unsigned long start, unsigned long len, void *func);
diff --git a/trunk/arch/ia64/mm/discontig.c b/trunk/arch/ia64/mm/discontig.c
index d8c5fcd89e5b..d85ba98d9008 100644
--- a/trunk/arch/ia64/mm/discontig.c
+++ b/trunk/arch/ia64/mm/discontig.c
@@ -635,7 +635,6 @@ static __init int count_node_pages(unsigned long start, unsigned long len, int n
 			(min(end, __pa(MAX_DMA_ADDRESS)) - start) >>PAGE_SHIFT;
 #endif
 	start = GRANULEROUNDDOWN(start);
-	start = ORDERROUNDDOWN(start);
 	end = GRANULEROUNDUP(end);
 	mem_data[node].max_pfn = max(mem_data[node].max_pfn,
 				     end >> PAGE_SHIFT);