Skip to content

Commit

Permalink
[PATCH] uml: redeclare highmem
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Jeff Dike authored and Linus Torvalds committed Mar 31, 2006
1 parent 02dea08 commit 9902abd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/um/include/user_util.h
Original file line number Diff line number Diff line change
Expand Up @@ -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[];

Expand Down
2 changes: 1 addition & 1 deletion arch/um/kernel/mem.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9902abd

Please sign in to comment.