From f51a70220db735f674bef18b6912e2b8fd0a5149 Mon Sep 17 00:00:00 2001
From: Chad Reese <creese@caviumnetworks.com>
Date: Tue, 30 May 2006 17:16:49 -0700
Subject: [PATCH] --- yaml --- r: 27137 b: refs/heads/master c:
 b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0 h: refs/heads/master i:   27135:
 6a70082c469bc9a564fe730c5d1b0297d4e05541 v: v3

---
 [refs]                             |  2 +-
 trunk/arch/mips/kernel/setup.c     |  3 +--
 trunk/arch/mips/mm/init.c          |  2 +-
 trunk/include/asm-mips/page.h      |  2 ++
 trunk/include/asm-mips/sparsemem.h | 14 ++++++++++++++
 5 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 trunk/include/asm-mips/sparsemem.h

diff --git a/[refs] b/[refs]
index 23a7420c0717..8a29a25e7d5d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ecf52d3c895c8bc069b9ae07c18acf39d846c2ef
+refs/heads/master: b1c231f5a57cb4a417c38a8a946f1e66db3bb9c0
diff --git a/trunk/arch/mips/kernel/setup.c b/trunk/arch/mips/kernel/setup.c
index a481be047696..397a70e651b5 100644
--- a/trunk/arch/mips/kernel/setup.c
+++ b/trunk/arch/mips/kernel/setup.c
@@ -355,8 +355,6 @@ static inline void bootmem_init(void)
 	}
 #endif
 
-	memory_present(0, first_usable_pfn, max_low_pfn);
-
 	/* Initialize the boot-time allocator with low memory only.  */
 	bootmap_size = init_bootmem(first_usable_pfn, max_low_pfn);
 
@@ -410,6 +408,7 @@ static inline void bootmem_init(void)
 
 		/* Register lowmem ranges */
 		free_bootmem(PFN_PHYS(curr_pfn), PFN_PHYS(size));
+		memory_present(0, curr_pfn, curr_pfn + size - 1);
 	}
 
 	/* Reserve the bootmap memory.  */
diff --git a/trunk/arch/mips/mm/init.c b/trunk/arch/mips/mm/init.c
index c22308b93ff0..33f6e1cdfd5b 100644
--- a/trunk/arch/mips/mm/init.c
+++ b/trunk/arch/mips/mm/init.c
@@ -227,7 +227,7 @@ void __init mem_init(void)
 	for (tmp = 0; tmp < max_low_pfn; tmp++)
 		if (page_is_ram(tmp)) {
 			ram++;
-			if (PageReserved(mem_map+tmp))
+			if (PageReserved(pfn_to_page(tmp)))
 				reservedpages++;
 		}
 
diff --git a/trunk/include/asm-mips/page.h b/trunk/include/asm-mips/page.h
index a1eab136ff6c..4035ec79ecd4 100644
--- a/trunk/include/asm-mips/page.h
+++ b/trunk/include/asm-mips/page.h
@@ -139,9 +139,11 @@ typedef struct { unsigned long pgprot; } pgprot_t;
 
 #define pfn_to_kaddr(pfn)	__va((pfn) << PAGE_SHIFT)
 
+#ifndef CONFIG_SPARSEMEM
 #ifndef CONFIG_NEED_MULTIPLE_NODES
 #define pfn_valid(pfn)		((pfn) < max_mapnr)
 #endif
+#endif
 
 #define virt_to_page(kaddr)	pfn_to_page(__pa(kaddr) >> PAGE_SHIFT)
 #define virt_addr_valid(kaddr)	pfn_valid(__pa(kaddr) >> PAGE_SHIFT)
diff --git a/trunk/include/asm-mips/sparsemem.h b/trunk/include/asm-mips/sparsemem.h
new file mode 100644
index 000000000000..795ac6c23203
--- /dev/null
+++ b/trunk/include/asm-mips/sparsemem.h
@@ -0,0 +1,14 @@
+#ifndef _MIPS_SPARSEMEM_H
+#define _MIPS_SPARSEMEM_H
+#ifdef CONFIG_SPARSEMEM
+
+/*
+ * SECTION_SIZE_BITS		2^N: how big each section will be
+ * MAX_PHYSMEM_BITS		2^N: how much memory we can have in that space
+ */
+#define SECTION_SIZE_BITS       28
+#define MAX_PHYSMEM_BITS        35
+
+#endif /* CONFIG_SPARSEMEM */
+#endif /* _MIPS_SPARSEMEM_H */
+