diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-01 14:29:12 -0500 |
commit | 6e07e16404deafadf45895a7d2aeb5feba53b479 (patch) | |
tree | a7025d6632f0b3eb6232eafba79f331ead812fcf /arch/um/os-Linux/mem.c | |
parent | 08a556db919f67e1e4d33ae8d40f7222da34d994 (diff) | |
parent | e8e0619f68bff8f39d98c46aac85ed1d4557ccfd (diff) |
Merge branch 'upstream'
Diffstat (limited to 'arch/um/os-Linux/mem.c')
-rw-r--r-- | arch/um/os-Linux/mem.c | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c index 9d7d69a523b..6ab372da965 100644 --- a/arch/um/os-Linux/mem.c +++ b/arch/um/os-Linux/mem.c @@ -121,36 +121,11 @@ int create_tmp_file(unsigned long long len) return(fd); } -static int create_anon_file(unsigned long long len) -{ - void *addr; - int fd; - - fd = open("/dev/anon", O_RDWR); - if(fd < 0) { - perror("opening /dev/anon"); - exit(1); - } - - addr = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); - if(addr == MAP_FAILED){ - perror("mapping physmem file"); - exit(1); - } - munmap(addr, len); - - return(fd); -} - -extern int have_devanon; - int create_mem_file(unsigned long long len) { int err, fd; - if(have_devanon) - fd = create_anon_file(len); - else fd = create_tmp_file(len); + fd = create_tmp_file(len); err = os_set_exec_close(fd, 1); if(err < 0){ |