Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 802e3077 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[PATCH] uml: fix format errors 



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

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 9cf85b3a

arch/um/drivers/slirp_user.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ static void slirp_close(int fd, void *data) 
	}



	if(err == 0) {

		printk("slirp_close: process %d has not exited\n");

		printk("slirp_close: process %d has not exited\n", pri->pid);

		return;

	}

arch/um/os-Linux/drivers/ethertap_user.c

+1 −1
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ static void etap_change(int op, unsigned char *addr, unsigned char *netmask, 
			int fd)

{

	struct addr_change change;

	void *output;

	char *output;

	int n;



	change.what = op;

arch/um/os-Linux/skas/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ 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 = %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",

arch/um/os-Linux/skas/process.c

+2 −2
Original line number Diff line number Diff line
@@ -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_stack, int pid) 
	 */

	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,

arch/um/sys-i386/ptrace_user.c

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void write_debugregs(int pid, unsigned long *regs) 
		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);

	}

}