Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae173816 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

[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: default avatarJeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 858259cf

arch/um/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ AFLAGS += $(ARCH_INCLUDE) 


USER_CFLAGS := $(patsubst -I%,,$(CFLAGS))

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

# kernel_errno to separate them from the libc errno.  This allows -fno-common

arch/um/include/mem_user.h

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ extern int init_maps(unsigned long physmem, unsigned long iomem, 
		     unsigned long highmem);

extern unsigned long get_vm(unsigned long len);

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 unsigned long phys_offset(unsigned long phys);

extern void unmap_physmem(void);

arch/um/include/os.h

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ extern int can_do_skas(void); 
#endif



/* mem.c */

extern int create_mem_file(unsigned long len);

extern int create_mem_file(unsigned long long len);



/* process.c */

extern unsigned long os_process_pc(int pid);

arch/um/kernel/physmem.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

arch/um/kernel/um_arch.c

+5 −5
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static char *argv1_end = NULL; 


/* Set in early boot */

static int have_root __initdata = 0;

long physmem_size = 32 * 1024 * 1024;

long long physmem_size = 32 * 1024 * 1024;



void set_cmdline(char *cmd)

{
@@ -402,7 +402,7 @@ int linux_main(int argc, char **argv) 
#ifndef CONFIG_HIGHMEM

		highmem = 0;

		printf("CONFIG_HIGHMEM not enabled - physical memory shrunk "

		       "to %ld bytes\n", physmem_size);

		       "to %lu bytes\n", physmem_size);

#endif

	}
@@ -414,8 +414,8 @@ int linux_main(int argc, char **argv) 


	setup_physmem(uml_physmem, uml_reserved, physmem_size, highmem);

	if(init_maps(physmem_size, iomem_size, highmem)){

		printf("Failed to allocate mem_map for %ld bytes of physical "

		       "memory and %ld bytes of highmem\n", physmem_size,

		printf("Failed to allocate mem_map for %lu bytes of physical "

		       "memory and %lu bytes of highmem\n", physmem_size,

		       highmem);

		exit(1);

	}
@@ -426,7 +426,7 @@ int linux_main(int argc, char **argv) 
	end_vm = start_vm + virtmem_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);



  	uml_postsetup();