From: Jeff Dike <jdike@addtoit.com>
Date: Fri, 31 Mar 2006 10:30:09 +0000 (-0800)
Subject: [PATCH] uml: redeclare highmem
X-Git-Tag: v2.6.17-rc1~119
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=9902abd7af17c3bdf57a5a092a66f502f79ba05e;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/arch/um/include/user_util.h b/arch/um/include/user_util.h
index 992a7e1e0fc..615f2f0a32d 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 92cce96b5e2..44e41a35f00 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;