uml: userspace files should call libc directly

A number of files that were changed in the recent removal of tt mode
are userspace files which call the os_* wrappers instead of calling
libc directly.  A few other files were affected by this, through

This patch makes these call glibc directly.

There are also style fixes in the affected areas.

os_print_error has no remaining callers, so it is deleted.

There is a interface change to os_set_exec_close, eliminating a
parameter which was always the same.  The callers are fixed as well.

os_process_pc got its error path cleaned up.

Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/um/os-Linux/mem.c b/arch/um/os-Linux/mem.c
index c6378c6d10d..436f8d20b20 100644
--- 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");