1 files changed, 47 insertions, 47 deletions

diff --git a/arch/um/os-Linux/skas/mem.c b/arch/um/os-Linux/skas/mem.c
index ae7685710c46..d58d11179bb7 100644
--- a/arch/um/os-Linux/skas/mem.c
+++ b/arch/um/os-Linux/skas/mem.c
@@ -1,30 +1,25 @@
 /*
- * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)
+ * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include <signal.h>
+#include <stddef.h>
+#include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <unistd.h>
 #include <sys/mman.h>
-#include <sys/wait.h>
-#include <asm/unistd.h>
-#include "mem_user.h"
-#include "mem.h"
-#include "skas.h"
-#include "user.h"
+#include "init.h"
+#include "kern_constants.h"
+#include "mm_id.h"
 #include "os.h"
 #include "proc_mm.h"
 #include "ptrace_user.h"
-#include "kern_util.h"
-#include "task.h"
 #include "registers.h"
-#include "uml-config.h"
+#include "skas.h"
+#include "user.h"
 #include "sysdep/ptrace.h"
 #include "sysdep/stub.h"
-#include "init.h"
-#include "kern_constants.h"
+#include "uml-config.h"
 
 extern unsigned long batch_syscall_stub, __syscall_stub_start;
 
@@ -33,7 +28,7 @@ extern void wait_stub_done(int pid);
 static inline unsigned long *check_init_stack(struct mm_id * mm_idp,
                                               unsigned long *stack)
 {
-        if(stack == NULL) {
+        if (stack == NULL) {
                 stack = (unsigned long *) mm_idp->stack + 2;
                 *stack = 0;
         }
@@ -67,29 +62,30 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
         unsigned long * syscall;
         int err, pid = mm_idp->u.pid;
 
-        if(proc_mm)
+        if (proc_mm)
                 /* FIXME: Need to look up userspace_pid by cpu */
                 pid = userspace_pid[0];
 
         multi_count++;
 
         n = ptrace_setregs(pid, syscall_regs);
-        if(n < 0){
-                printk("Registers - \n");
-                for(i = 0; i < MAX_REG_NR; i++)
-                        printk("\t%d\t0x%lx\n", i, syscall_regs[i]);
+        if (n < 0) {
+                printk(UM_KERN_ERR "Registers - \n");
+                for (i = 0; i < MAX_REG_NR; i++)
+                        printk(UM_KERN_ERR "\t%d\t0x%lx\n", i, syscall_regs[i]);
                 panic("do_syscall_stub : PTRACE_SETREGS failed, errno = %d\n",
                       -n);
         }
 
         err = ptrace(PTRACE_CONT, pid, 0, 0);
-        if(err)
+        if (err)
                 panic("Failed to continue stub, pid = %d, errno = %d\n", pid,
                       errno);
 
         wait_stub_done(pid);
 
-        /* When the stub stops, we find the following values on the
+        /*
+         * When the stub stops, we find the following values on the
          * beginning of the stack:
          * (long )return_value
          * (long )offset to failed sycall-data (0, if no error)
@@ -99,24 +95,25 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
         if (offset) {
                 data = (unsigned long *)(mm_idp->stack +
                                          offset - UML_CONFIG_STUB_DATA);
-                printk("do_syscall_stub : ret = %ld, offset = %ld, "
+                printk(UM_KERN_ERR "do_syscall_stub : ret = %ld, offset = %ld, "
                        "data = %p\n", ret, offset, data);
                 syscall = (unsigned long *)((unsigned long)data + data[0]);
-                printk("do_syscall_stub: syscall %ld failed, return value = "
-                       "0x%lx, expected return value = 0x%lx\n",
+                printk(UM_KERN_ERR "do_syscall_stub: syscall %ld failed, "
+                       "return value = 0x%lx, expected return value = 0x%lx\n",
                        syscall[0], ret, syscall[7]);
-                printk("    syscall parameters: "
+                printk(UM_KERN_ERR "    syscall parameters: "
                        "0x%lx 0x%lx 0x%lx 0x%lx 0x%lx 0x%lx\n",
                        syscall[1], syscall[2], syscall[3],
                        syscall[4], syscall[5], syscall[6]);
-                for(n = 1; n < data[0]/sizeof(long); n++) {
-                        if(n == 1)
-                                printk("    additional syscall data:");
-                        if(n % 4 == 1)
-                                printk("\n      ");
+                for (n = 1; n < data[0]/sizeof(long); n++) {
+                        if (n == 1)
+                                printk(UM_KERN_ERR "    additional syscall "
+                                       "data:");
+                        if (n % 4 == 1)
+                                printk("\n" UM_KERN_ERR "      ");
                         printk("  0x%lx", data[n]);
                 }
-                if(n > 1)
+                if (n > 1)
                         printk("\n");
         }
         else ret = 0;
@@ -132,7 +129,7 @@ long run_syscall_stub(struct mm_id * mm_idp, int syscall,
 {
         unsigned long *stack = check_init_stack(mm_idp, *addr);
 
-        if(done && *addr == NULL)
+        if (done && *addr == NULL)
                 single_count++;
 
         *stack += sizeof(long);
@@ -149,8 +146,8 @@ long run_syscall_stub(struct mm_id * mm_idp, int syscall,
         *stack = 0;
         multi_op_count++;
 
-        if(!done && ((((unsigned long) stack) & ~UM_KERN_PAGE_MASK) <
-                     UM_KERN_PAGE_SIZE - 10 * sizeof(long))){
+        if (!done && ((((unsigned long) stack) & ~UM_KERN_PAGE_MASK) <
+                     UM_KERN_PAGE_SIZE - 10 * sizeof(long))) {
                 *addr = stack;
                 return 0;
         }
@@ -165,14 +162,15 @@ long syscall_stub_data(struct mm_id * mm_idp,
         unsigned long *stack;
         int ret = 0;
 
-        /* If *addr still is uninitialized, it *must* contain NULL.
+        /*
+         * If *addr still is uninitialized, it *must* contain NULL.
          * Thus in this case do_syscall_stub correctly won't be called.
          */
-        if((((unsigned long) *addr) & ~UM_KERN_PAGE_MASK) >=
+        if ((((unsigned long) *addr) & ~UM_KERN_PAGE_MASK) >=
            UM_KERN_PAGE_SIZE - (10 + data_count) * sizeof(long)) {
                 ret = do_syscall_stub(mm_idp, addr);
                 /* in case of error, don't overwrite data on stack */
-                if(ret)
+                if (ret)
                         return ret;
         }
 
@@ -194,7 +192,7 @@ int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len, int prot,
 {
         int ret;
 
-        if(proc_mm){
+        if (proc_mm) {
                 struct proc_mm_op map;
                 int fd = mm_idp->u.mm_fd;
 
@@ -210,9 +208,10 @@ int map(struct mm_id * mm_idp, unsigned long virt, unsigned long len, int prot,
                                            .offset= offset
                                          } } } );
                 CATCH_EINTR(ret = write(fd, &map, sizeof(map)));
-                if(ret != sizeof(map)){
+                if (ret != sizeof(map)) {
                         ret = -errno;
-                        printk("map : /proc/mm map failed, err = %d\n", -ret);
+                        printk(UM_KERN_ERR "map : /proc/mm map failed, "
+                               "err = %d\n", -ret);
                 }
                 else ret = 0;
         }
@@ -233,7 +232,7 @@ int unmap(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
 {
         int ret;
 
-        if(proc_mm){
+        if (proc_mm) {
                 struct proc_mm_op unmap;
                 int fd = mm_idp->u.mm_fd;
 
@@ -244,9 +243,10 @@ int unmap(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
                                              (unsigned long) addr,
                                              .len               = len } } } );
                 CATCH_EINTR(ret = write(fd, &unmap, sizeof(unmap)));
-                if(ret != sizeof(unmap)){
+                if (ret != sizeof(unmap)) {
                         ret = -errno;
-                        printk("unmap - proc_mm write returned %d\n", ret);
+                        printk(UM_KERN_ERR "unmap - proc_mm write returned "
+                               "%d\n", ret);
                 }
                 else ret = 0;
         }
@@ -267,7 +267,7 @@ int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
         struct proc_mm_op protect;
         int ret;
 
-        if(proc_mm){
+        if (proc_mm) {
                 int fd = mm_idp->u.mm_fd;
 
                 protect = ((struct proc_mm_op) { .op    = MM_MPROTECT,
@@ -279,9 +279,9 @@ int protect(struct mm_id * mm_idp, unsigned long addr, unsigned long len,
                                                .prot    = prot } } } );
 
                 CATCH_EINTR(ret = write(fd, &protect, sizeof(protect)));
-                if(ret != sizeof(protect)){
+                if (ret != sizeof(protect)) {
                         ret = -errno;
-                        printk("protect failed, err = %d", -ret);
+                        printk(UM_KERN_ERR "protect failed, err = %d", -ret);
                 }
                 else ret = 0;
         }