X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fum%2Fkernel%2Fmem.c;h=72ff85693a399846bcb54ada54396d6ddf68b0a4;hb=5335a40be6867eff986a31bcd8fc82a5cb1e16bb;hp=e85d65deea0db9c46f16085c8f168e56e4a475c5;hpb=9cdd79c9b99873d600d397fda012fc3f57cc2776;p=powerpc.git

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index e85d65deea..72ff85693a 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -13,8 +13,8 @@
 #include "asm/page.h"
 #include "asm/fixmap.h"
 #include "asm/pgalloc.h"
-#include "user_util.h"
 #include "kern_util.h"
+#include "as-layout.h"
 #include "kern.h"
 #include "mem_user.h"
 #include "uml_uaccess.h"
@@ -64,8 +64,6 @@ static void setup_highmem(unsigned long highmem_start,
 
 void mem_init(void)
 {
-	max_low_pfn = (high_physmem - uml_physmem) >> PAGE_SHIFT;
-
 	/* clear the zero-page */
 	memset((void *) empty_zero_page, 0, PAGE_SIZE);
 
@@ -80,6 +78,7 @@ void mem_init(void)
 
 	/* this will put all low memory onto the freelists */
 	totalram_pages = free_all_bootmem();
+	max_low_pfn = totalram_pages;
 #ifdef CONFIG_HIGHMEM
 	totalhigh_pages = highmem >> PAGE_SHIFT;
 	totalram_pages += totalhigh_pages;
@@ -217,7 +216,7 @@ static void __init fixaddr_user_init( void)
 #endif
 }
 
-void paging_init(void)
+void __init paging_init(void)
 {
 	unsigned long zones_size[MAX_NR_ZONES], vaddr;
 	int i;