From 4843493f40a07780635be5591c824d75127d8b78 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Fri, 31 Mar 2006 02:30:09 -0800
Subject: [PATCH] --- yaml --- r: 24857 b: refs/heads/master c:
 9902abd7af17c3bdf57a5a092a66f502f79ba05e h: refs/heads/master i:   24855:
 1635d396a5eaa2c79cafd05d6730c426583ef6bb v: v3

---
 [refs]                            | 2 +-
 trunk/arch/um/include/user_util.h | 2 +-
 trunk/arch/um/kernel/mem.c        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 03ca35fa9b66..2ff6e6dab97c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02dea0875b0f9b331a65fd6097dfd6115ca4ef24
+refs/heads/master: 9902abd7af17c3bdf57a5a092a66f502f79ba05e
diff --git a/trunk/arch/um/include/user_util.h b/trunk/arch/um/include/user_util.h
index 992a7e1e0fca..615f2f0a32d0 100644
--- a/trunk/arch/um/include/user_util.h
+++ b/trunk/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/trunk/arch/um/kernel/mem.c b/trunk/arch/um/kernel/mem.c
index 92cce96b5e24..44e41a35f000 100644
--- a/trunk/arch/um/kernel/mem.c
+++ b/trunk/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;