aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-03-31 05:30:09 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-31 15:18:50 -0500
commit9902abd7af17c3bdf57a5a092a66f502f79ba05e (patch)
treec6da5170df3ebd016f3d813b8c891471373337b1
parent02dea0875b0f9b331a65fd6097dfd6115ca4ef24 (diff)
[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;
31extern unsigned long uml_reserved; 31extern unsigned long uml_reserved;
32extern unsigned long end_vm; 32extern unsigned long end_vm;
33extern unsigned long start_vm; 33extern unsigned long start_vm;
34extern unsigned long highmem; 34extern unsigned long long highmem;
35 35
36extern char host_info[]; 36extern char host_info[];
37 37
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;
30unsigned long *empty_zero_page = NULL; 30unsigned long *empty_zero_page = NULL;
31unsigned long *empty_bad_page = NULL; 31unsigned long *empty_bad_page = NULL;
32pgd_t swapper_pg_dir[PTRS_PER_PGD]; 32pgd_t swapper_pg_dir[PTRS_PER_PGD];
33unsigned long highmem; 33unsigned long long highmem;
34int kmalloc_ok = 0; 34int kmalloc_ok = 0;
35 35
36static unsigned long brk_end; 36static unsigned long brk_end;