summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-03-31 14:30:09 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-01 00:18:50 +0400
commit9902abd7af17c3bdf57a5a092a66f502f79ba05e (patch)
treec6da5170df3ebd016f3d813b8c891471373337b1
parent02dea0875b0f9b331a65fd6097dfd6115ca4ef24 (diff)
downloadlinux-9902abd7af17c3bdf57a5a092a66f502f79ba05e.tar.xz
[PATCH] uml: redeclare highmem
The earlier printf patch missed a corresponding change in the printed variable. Signed-off-by: Jeff Dike <jdike@addtoit.com> Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/um/include/user_util.h2
-rw-r--r--arch/um/kernel/mem.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 992a7e1e0fca..615f2f0a32d0 100644
--- 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 92cce96b5e24..44e41a35f000 100644
--- 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;