[PATCH] uml: change sigjmp_buf to jmp_buf

[linux-2.6-omap-h63xx.git] / arch / um / os-Linux / mem.c

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index 8e71edaaf80b1f53b2a66afe2ec208df375c15c1..71bb90a7606d0ebf8dab332fd874aa0e0f6d707b 100644 (file)
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -53,33 +53,36 @@ static void __init find_tempdir(void)
  */
 int make_tempfile(const char *template, char **out_tempname, int do_unlink)
 {
-       char tempname[MAXPATHLEN];
+       char *tempname;
        int fd;
 
+       tempname = malloc(MAXPATHLEN);
+
        find_tempdir();
-       if (*template != '/')
+       if (template[0] != '/')
                strcpy(tempname, tempdir);
        else
-               *tempname = 0;
+               tempname[0] = '\0';
        strcat(tempname, template);
        fd = mkstemp(tempname);
        if(fd < 0){
                fprintf(stderr, "open - cannot create %s: %s\n", tempname,
                        strerror(errno));
-               return -1;
+               goto out;
        }
        if(do_unlink && (unlink(tempname) < 0)){
                perror("unlink");
-               return -1;
+               goto out;
        }
        if(out_tempname){
-               *out_tempname = strdup(tempname);
-               if(*out_tempname == NULL){
-                       perror("strdup");
-                       return -1;
-               }
+               *out_tempname = tempname;
+       } else {
+               free(tempname);
        }
        return(fd);
+out:
+       free(tempname);
+       return -1;
 }
 
 #define TEMPNAME_TEMPLATE "vm_file-XXXXXX"
@@ -88,7 +91,7 @@ int make_tempfile(const char *template, char **out_tempname, int do_unlink)
  * This proc is used in start_up.c
  * So it isn't 'static'.
  */
-int create_tmp_file(unsigned long len)
+int create_tmp_file(unsigned long long len)
 {
        int fd, err;
        char zero;
@@ -121,36 +124,11 @@ int create_tmp_file(unsigned long len)
        return(fd);
 }
 
-static int create_anon_file(unsigned 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 len)
+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){