diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
| commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
| tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /arch/um/kernel/mem.c | |
| parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
| parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'arch/um/kernel/mem.c')
| -rw-r--r-- | arch/um/kernel/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c index 92cce96b5e24..44e41a35f000 100644 --- a/arch/um/kernel/mem.c +++ b/arch/um/kernel/mem.c | |||
| @@ -30,7 +30,7 @@ extern char __binary_start; | |||
| 30 | unsigned long *empty_zero_page = NULL; | 30 | unsigned long *empty_zero_page = NULL; |
| 31 | unsigned long *empty_bad_page = NULL; | 31 | unsigned long *empty_bad_page = NULL; |
| 32 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; | 32 | pgd_t swapper_pg_dir[PTRS_PER_PGD]; |
| 33 | unsigned long highmem; | 33 | unsigned long long highmem; |
| 34 | int kmalloc_ok = 0; | 34 | int kmalloc_ok = 0; |
| 35 | 35 | ||
| 36 | static unsigned long brk_end; | 36 | static unsigned long brk_end; |