[PATCH] uml: redeclare highmem

The earlier printf patch missed a corresponding change in the printed
variable.

Signed-off-by: Jeff Dike <[email protected]>
Cc: Paolo 'Blaisorblade' Giarrusso <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 992a7e1e0fca9bb3034f3210458feaf4ebaf28d2..615f2f0a32d0337fce7b489365aa5b8946a86157 100644 (file)
--- a/arch/um/include/user_util.h
+++ b/arch/um/include/user_util.h
@@ -31,7 +31,7 @@ extern unsigned long uml_physmem;
 extern unsigned long uml_reserved;
 extern unsigned long end_vm;
 extern unsigned long start_vm;
-extern unsigned long highmem;
+extern unsigned long long highmem;
 
 extern char host_info[];
 

diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 92cce96b5e24d01f50d7502ba81f1b64e98a1683..44e41a35f000cd667c737d856d1f48af0f6bf200 100644 (file)
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -30,7 +30,7 @@ extern char __binary_start;
 unsigned long *empty_zero_page = NULL;
 unsigned long *empty_bad_page = NULL;
 pgd_t swapper_pg_dir[PTRS_PER_PGD];
-unsigned long highmem;
+unsigned long long highmem;
 int kmalloc_ok = 0;
 
 static unsigned long brk_end;