From 9902abd7af17c3bdf57a5a092a66f502f79ba05e Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Fri, 31 Mar 2006 02:30:09 -0800 Subject: [PATCH] [PATCH] uml: redeclare highmem The earlier printf patch missed a corresponding change in the printed variable. Signed-off-by: Jeff Dike Cc: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- arch/um/include/user_util.h | 2 +- arch/um/kernel/mem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h index 992a7e1..615f2f0 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 92cce96..44e41a3 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; -- 2.7.4