---

yaml --- r: 24857 b: refs/heads/master c: 9902abd h: refs/heads/master i: 24855: 1635d39 v: v3
git-mirror · Mar 31, 2006 · 4843493 · 4843493
1 parent a8d636a
commit 4843493
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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;