diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-09 23:33:22 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-09 23:33:22 +0100 |
| commit | e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch) | |
| tree | 69d5685ef0c194f651a03e30bff14628b4d45400 /arch/um/kernel/physmem.c | |
| parent | [CIFS] Update kconfig for cifs (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sha... (diff) | |
| download | linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.tar.xz linux-e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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) /* Changed during early boot */ unsigned long high_physmem; -extern unsigned long physmem_size; +extern unsigned long long physmem_size; int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem) { @@ -321,7 +321,7 @@ void map_memory(unsigned long virt, unsigned long phys, unsigned long len, extern int __syscall_stub_start, __binary_start; void setup_physmem(unsigned long start, unsigned long reserve_end, - unsigned long len, unsigned long highmem) + unsigned long len, unsigned long long highmem) { unsigned long reserve = reserve_end - start; int pfn = PFN_UP(__pa(reserve_end)); |