lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] uml: fix format errors

Browse Source 
Now that GCC warns about format errors, fix them.  Nothing able to cause a
crash, however.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Paolo 'Blaisorblade' Giarrusso
2006-04-10 22:53:32 -07:00
committed by Linus Torvalds
parent 9cf85b3af2
commit 802e307795
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/drivers/slirp_user.c
View File

@@ -104,7 +104,7 @@ static void slirp_close(int fd, void *data)
} }
if(err == 0) { if(err == 0) {
printk("slirp_close: process %d has not exited\n"); printk("slirp_close: process %d has not exited\n", pri->pid);
return; return;
} }

2
arch/um/os-Linux/drivers/ethertap_user.c
View File

@@ -40,7 +40,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask,
int fd) int fd)
{ {
struct addr_change change; struct addr_change change;
void *output; char *output;
int n; int n;
change.what = op; change.what = op;

4
arch/um/os-Linux/skas/mem.c
View File

@@ -82,8 +82,8 @@ static inline long do_syscall_stub(struct mm_id * mm_idp, void **addr)
if (offset) { if (offset) {
data = (unsigned long *)(mm_idp->stack + data = (unsigned long *)(mm_idp->stack +
offset - UML_CONFIG_STUB_DATA); offset - UML_CONFIG_STUB_DATA);
printk("do_syscall_stub : ret = %d, offset = %d, " printk("do_syscall_stub : ret = %ld, offset = %ld, "
"data = 0x%x\n", ret, offset, data); "data = %p\n", ret, offset, data);
syscall = (unsigned long *)((unsigned long)data + data[0]); syscall = (unsigned long *)((unsigned long)data + data[0]);
printk("do_syscall_stub: syscall %ld failed, return value = " printk("do_syscall_stub: syscall %ld failed, return value = "
"0x%lx, expected return value = 0x%lx\n", "0x%lx, expected return value = 0x%lx\n",

4
arch/um/os-Linux/skas/process.c
View File

@@ -265,7 +265,7 @@ void userspace(union uml_pt_regs *regs)
if(err) if(err)
panic("userspace - could not resume userspace process, " panic("userspace - could not resume userspace process, "
"pid=%d, ptrace operation = %d, errno = %d\n", "pid=%d, ptrace operation = %d, errno = %d\n",
op, errno); pid, op, errno);
CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED)); CATCH_EINTR(err = waitpid(pid, &status, WUNTRACED));
if(err < 0) if(err < 0)
@@ -369,7 +369,7 @@ int copy_context_skas0(unsigned long new_stack, int pid)
*/ */
wait_stub_done(pid, -1, "copy_context_skas0"); wait_stub_done(pid, -1, "copy_context_skas0");
if (child_data->err != UML_CONFIG_STUB_DATA) 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); child_data->err);
if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL, if (ptrace(PTRACE_OLDSETOPTIONS, pid, NULL,

2
arch/um/sys-i386/ptrace_user.c
View File

@@ -57,7 +57,7 @@ static void write_debugregs(int pid, unsigned long *regs)
if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i], if(ptrace(PTRACE_POKEUSR, pid, &dummy->u_debugreg[i],
regs[i]) < 0) regs[i]) < 0)
printk("write_debugregs - ptrace failed on " 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); regs[i], errno);
} }
} }