diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-10 04:12:10 -0500 |
| commit | 2f67bdb23d74a6c6fd4f98f64239c5c34d1833cc (patch) | |
| tree | fe533abe3e7c400848647b95e4806f5125c654c3 /arch/um/kernel/physmem.c | |
| parent | d40d9d29c020f8466c96f8e3ad4b7c014ff1085d (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/um/kernel/physmem.c')
| -rw-r--r-- | arch/um/kernel/physmem.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index ea670fcc8af5..f3b583a878a6 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c | |||
| @@ -246,7 +246,7 @@ int is_remapped(void *virt) | |||
| 246 | /* Changed during early boot */ | 246 | /* Changed during early boot */ |
| 247 | unsigned long high_physmem; | 247 | unsigned long high_physmem; |
| 248 | 248 | ||
| 249 | extern unsigned long physmem_size; | 249 | extern unsigned long long physmem_size; |
| 250 | 250 | ||
| 251 | int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) | 251 | int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) |
| 252 | { | 252 | { |
| @@ -321,7 +321,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, | |||
| 321 | extern int __syscall_stub_start, __binary_start; | 321 | extern int __syscall_stub_start, __binary_start; |
| 322 | 322 | ||
| 323 | void setup_physmem(unsigned long start, unsigned long reserve_end, | 323 | void setup_physmem(unsigned long start, unsigned long reserve_end, |
| 324 | unsigned long len, unsigned long highmem) | 324 | unsigned long len, unsigned long long highmem) |
| 325 | { | 325 | { |
| 326 | unsigned long reserve = reserve_end - start; | 326 | unsigned long reserve = reserve_end - start; |
| 327 | int pfn = PFN_UP(__pa(reserve_end)); | 327 | int pfn = PFN_UP(__pa(reserve_end)); |