asgardius/android_kernel_motorola_sm6225
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[PATCH] uml: big memory fixes

Browse source 
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>
This commit is contained in:
Jeff Dike 2005-11-07 00:58:57 -08:00 committed by Linus Torvalds
parent 858259cf7d
commit ae17381608
7 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/um/Makefile
View file

@ -60,7 +60,7 @@ AFLAGS += $(ARCH_INCLUDE)
USER_CFLAGS := $(patsubst -I%,,$(CFLAGS)) USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))
USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \ USER_CFLAGS := $(patsubst -D__KERNEL__,,$(USER_CFLAGS)) $(ARCH_INCLUDE) \
$(MODE_INCLUDE) $(MODE_INCLUDE) -D_FILE_OFFSET_BITS=64
# -Derrno=kernel_errno - This turns all kernel references to errno into # -Derrno=kernel_errno - This turns all kernel references to errno into
# kernel_errno to separate them from the libc errno. This allows -fno-common # kernel_errno to separate them from the libc errno. This allows -fno-common

2
arch/um/include/mem_user.h
View file

@ -57,7 +57,7 @@ extern int init_maps(unsigned long physmem, unsigned long iomem,
unsigned long highmem); unsigned long highmem);
extern unsigned long get_vm(unsigned long len); extern unsigned long get_vm(unsigned long len);
extern void setup_physmem(unsigned long start, unsigned long usable, extern void setup_physmem(unsigned long start, unsigned long usable,
unsigned long len, unsigned long highmem); unsigned long len, unsigned long long highmem);
extern void add_iomem(char *name, int fd, unsigned long size); extern void add_iomem(char *name, int fd, unsigned long size);
extern unsigned long phys_offset(unsigned long phys); extern unsigned long phys_offset(unsigned long phys);
extern void unmap_physmem(void); extern void unmap_physmem(void);

2
arch/um/include/os.h
View file

@ -167,7 +167,7 @@ extern int can_do_skas(void);
#endif #endif
/* mem.c */ /* mem.c */
extern int create_mem_file(unsigned long len); extern int create_mem_file(unsigned long long len);
/* process.c */ /* process.c */
extern unsigned long os_process_pc(int pid); extern unsigned long os_process_pc(int pid);

4
arch/um/kernel/physmem.c
View file

@ -246,7 +246,7 @@ int is_remapped(void *virt)
/* Changed during early boot */ /* Changed during early boot */
unsigned long high_physmem; 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) 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; extern int __syscall_stub_start, __binary_start;
void setup_physmem(unsigned long start, unsigned long reserve_end, 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; unsigned long reserve = reserve_end - start;
int pfn = PFN_UP(__pa(reserve_end)); int pfn = PFN_UP(__pa(reserve_end));

10
arch/um/kernel/um_arch.c
View file

@ -137,7 +137,7 @@ static char *argv1_end = NULL;
/* Set in early boot */ /* Set in early boot */
static int have_root __initdata = 0; static int have_root __initdata = 0;
long physmem_size = 32 * 1024 * 1024; long long physmem_size = 32 * 1024 * 1024;
void set_cmdline(char *cmd) void set_cmdline(char *cmd)
{ {
@ -402,7 +402,7 @@ int linux_main(int argc, char **argv)
#ifndef CONFIG_HIGHMEM #ifndef CONFIG_HIGHMEM
highmem = 0; highmem = 0;
printf("CONFIG_HIGHMEM not enabled - physical memory shrunk " printf("CONFIG_HIGHMEM not enabled - physical memory shrunk "
"to %ld bytes\n", physmem_size); "to %lu bytes\n", physmem_size);
#endif #endif
} }
@ -414,8 +414,8 @@ int linux_main(int argc, char **argv)
setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem); setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);
if(init_maps(physmem_size, iomem_size, highmem)){ if(init_maps(physmem_size, iomem_size, highmem)){
printf("Failed to allocate mem_map for %ld bytes of physical " printf("Failed to allocate mem_map for %lu bytes of physical "
"memory and %ld bytes of highmem\n", physmem_size, "memory and %lu bytes of highmem\n", physmem_size,
highmem); highmem);
exit(1); exit(1);
} }
@ -426,7 +426,7 @@ int linux_main(int argc, char **argv)
end_vm = start_vm + virtmem_size; end_vm = start_vm + virtmem_size;
if(virtmem_size < physmem_size) if(virtmem_size < physmem_size)
printf("Kernel virtual memory size shrunk to %ld bytes\n", printf("Kernel virtual memory size shrunk to %lu bytes\n",
virtmem_size); virtmem_size);
uml_postsetup(); uml_postsetup();

6
arch/um/os-Linux/mem.c
View file

@ -88,7 +88,7 @@ int make_tempfile(const char *template, char **out_tempname, int do_unlink)
* This proc is used in start_up.c * This proc is used in start_up.c
* So it isn't 'static'. * So it isn't 'static'.
*/ */
int create_tmp_file(unsigned long len) int create_tmp_file(unsigned long long len)
{ {
int fd, err; int fd, err;
char zero; char zero;
@ -121,7 +121,7 @@ int create_tmp_file(unsigned long len)
return(fd); return(fd);
} }
static int create_anon_file(unsigned long len) static int create_anon_file(unsigned long long len)
{ {
void *addr; void *addr;
int fd; int fd;
@ -144,7 +144,7 @@ static int create_anon_file(unsigned long len)
extern int have_devanon; extern int have_devanon;
int create_mem_file(unsigned long len) int create_mem_file(unsigned long long len)
{ {
int err, fd; int err, fd;

2
arch/um/os-Linux/start_up.c
View file

@ -296,7 +296,7 @@ static void __init check_ptrace(void)
check_sysemu(); check_sysemu();
} }
extern int create_tmp_file(unsigned long len); extern int create_tmp_file(unsigned long long len);
static void check_tmpexec(void) static void check_tmpexec(void)
{ {