Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[mv-sheeva.git] / arch / um / os-Linux / mem.c

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index c6378c6d10d2821f2d4da93a7618d5ce1935302d..436f8d20b20f64de342c3b4a4c2fdef2d92dab2f 100644 (file)
--- a/arch/um/os-Linux/mem.c
+++ b/arch/um/os-Linux/mem.c
@@ -218,7 +218,7 @@ int __init create_tmp_file(unsigned long long len)
 
        err = fchmod(fd, 0777);
        if(err < 0){
-               perror("os_mode_fd");
+               perror("fchmod");
                exit(1);
        }
 
@@ -226,7 +226,7 @@ int __init create_tmp_file(unsigned long long len)
         * increase the file size by one byte, to the desired length.
         */
        if (lseek64(fd, len - 1, SEEK_SET) < 0) {
-               perror("os_seek_file");
+               perror("lseek64");
                exit(1);
        }
 
@@ -247,7 +247,7 @@ int __init create_mem_file(unsigned long long len)
 
        fd = create_tmp_file(len);
 
-       err = os_set_exec_close(fd, 1);
+       err = os_set_exec_close(fd);
        if(err < 0){
                errno = -err;
                perror("exec_close");