diff options
author | Jeff Dike <jdike@addtoit.com> | 2005-11-07 03:58:57 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-07 10:53:31 -0500 |
commit | ae17381608a11781a6a67e0ce51607f36780aac7 (patch) | |
tree | e4bd104cb7f3728f2e91646d4def091f8f933447 /arch/um/kernel/physmem.c | |
parent | 858259cf7d1c443c836a2022b78cb281f0a9b95e (diff) |
[PATCH] uml: big memory fixes
A number of fixes to improve behavior when large physical memory sizes
are specified:
- libc files need -D_FILE_OFFSET_BITS=64 because there are unavoidable uses
of non-64 interfaces in libc
- some %d need to be %u
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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)); |