2006-03-28 23:01:57

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 1/10] UML - Redeclare highmem

The earlier printf patch missed a corresponding change in the printed
variable.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.16-mm/arch/um/include/user_util.h
===================================================================
--- linux-2.6.16-mm.orig/arch/um/include/user_util.h 2006-03-28 09:30:36.000000000 -0500
+++ linux-2.6.16-mm/arch/um/include/user_util.h 2006-03-28 15:59:38.000000000 -0500
@@ -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[];

Index: linux-2.6.16-mm/arch/um/kernel/mem.c
===================================================================
--- linux-2.6.16-mm.orig/arch/um/kernel/mem.c 2006-03-28 15:55:28.000000000 -0500
+++ linux-2.6.16-mm/arch/um/kernel/mem.c 2006-03-28 15:59:33.000000000 -0500
@@ -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;