From: Paolo 'Blaisorblade' Giarrusso Now that GCC warns about format errors, fix them. Nothing able to cause a crash, however. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton --- arch/um/drivers/slirp_user.c | 2 +- arch/um/os-Linux/drivers/ethertap_user.c | 2 +- arch/um/os-Linux/skas/mem.c | 4 ++-- arch/um/os-Linux/skas/process.c | 4 ++-- arch/um/sys-i386/ptrace_user.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff -puN arch/um/drivers/slirp_user.c~uml-fix-format-errors arch/um/drivers/slirp_user.c --- 25/arch/um/drivers/slirp_user.c~uml-fix-format-errors Fri Apr 7 15:22:34 2006 +++ 25-akpm/arch/um/drivers/slirp_user.c Fri Apr 7 15:22:34 2006 @@ -104,7 +104,7 @@ static void slirp_close(int fd, void *da } if(err == 0) { - printk("slirp_close: process %d has not exited\n"); + printk("slirp_close: process %d has not exited\n", pri->pid); return; } diff -puN arch/um/os-Linux/drivers/ethertap_user.c~uml-fix-format-errors arch/um/os-Linux/drivers/ethertap_user.c --- 25/arch/um/os-Linux/drivers/ethertap_user.c~uml-fix-format-errors Fri Apr 7 15:22:34 2006 +++ 25-akpm/arch/um/os-Linux/drivers/ethertap_user.c Fri Apr 7 15:22:34 2006 @@ -40,7 +40,7 @@ static void etap_change(int op, unsigned int fd) { struct addr_change change; - void *output; + char *output; int n; change.what = op; diff -puN arch/um/os-Linux/skas/mem.c~uml-fix-format-errors arch/um/os-Linux/skas/mem.c --- 25/arch/um/os-Linux/skas/mem.c~uml-fix-format-errors Fri Apr 7 15:22:34 2006 +++ 25-akpm/arch/um/os-Linux/skas/mem.c Fri Apr 7 15:22:34 2006 @@ -82,8 +82,8 @@ static inline long do_syscall_stub(struc if (offset) { data = (unsigned long *)(mm_idp->stack + offset - UML_CONFIG_STUB_DATA); - printk("do_syscall_stub : ret = %d, offset = %d, " - "data = 0x%x\n", ret, offset, data); + printk("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", diff -puN arch/um/os-Linux/skas/process.c~uml-fix-format-errors arch/um/os-Linux/skas/process.c --- 25/arch/um/os-Linux/skas/process.c~uml-fix-format-errors Fri Apr 7 15:22:34 2006 +++ 25-akpm/arch/um/os-Linux/skas/process.c Fri Apr 7 15:22:34 2006 @@ -265,7 +265,7 @@ void userspace(union uml_pt_regs *regs) if(err) panic("userspace - could not resume userspace process, " "pid=%d, ptrace operation = %d, errno = %d\n", - op, errno); + pid, op, errno); CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED)); if(err < 0) @@ -369,7 +369,7 @@ int copy_context_skas0(unsigned long new */ wait_stub_done(pid, -1, "copy_context_skas0"); if (child_data->err != UML_CONFIG_STUB_DATA) - panic("copy_context_skas0 - stub-child reports error %d\n", + panic("copy_context_skas0 - stub-child reports error %ld\n", child_data->err); if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL, diff -puN arch/um/sys-i386/ptrace_user.c~uml-fix-format-errors arch/um/sys-i386/ptrace_user.c --- 25/arch/um/sys-i386/ptrace_user.c~uml-fix-format-errors Fri Apr 7 15:22:34 2006 +++ 25-akpm/arch/um/sys-i386/ptrace_user.c Fri Apr 7 15:22:34 2006 @@ -57,7 +57,7 @@ static void write_debugregs(int pid, uns if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i], regs[i]) < 0) printk("write_debugregs - ptrace failed on " - "register %d, value = 0x%x, errno = %d\n", i, + "register %d, value = 0x%lx, errno = %d\n", i, regs[i], errno); } } _