[PATCH 3/19] UML - Style fixes

From: Jeff Dike
Date: Fri Apr 25 2008 - 14:08:24 EST


A few random style fixes.

Signed-off-by: Jeff Dike <jdike@xxxxxxxxxxxxxxx>
---
arch/um/include/skas_ptrace.h | 13 +------------
arch/um/include/sysdep-i386/sigcontext.h | 2 +-
arch/um/kernel/um_arch.c | 2 +-
arch/um/os-Linux/skas/process.c | 2 +-
4 files changed, 4 insertions(+), 15 deletions(-)

Index: linux-2.6-git/arch/um/include/skas_ptrace.h
===================================================================
--- linux-2.6-git.orig/arch/um/include/skas_ptrace.h 2008-02-21 18:47:34.000000000 -0500
+++ linux-2.6-git/arch/um/include/skas_ptrace.h 2008-03-06 09:46:19.000000000 -0500
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@xxxxxxxxxx)
+ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
* Licensed under the GPL
*/

@@ -12,14 +12,3 @@
#include "sysdep/skas_ptrace.h"

#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only. This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
Index: linux-2.6-git/arch/um/os-Linux/skas/process.c
===================================================================
--- linux-2.6-git.orig/arch/um/os-Linux/skas/process.c 2008-02-26 10:26:40.000000000 -0500
+++ linux-2.6-git/arch/um/os-Linux/skas/process.c 2008-03-06 09:46:19.000000000 -0500
@@ -442,7 +442,7 @@ void userspace(struct uml_pt_regs *regs)
unblock_signals();
break;
default:
- printk(UM_KERN_ERR "userspace - child stopped "
+ printk(UM_KERN_ERR "userspace - child stopped "
"with signal %d\n", sig);
fatal_sigsegv();
}
Index: linux-2.6-git/arch/um/include/sysdep-i386/sigcontext.h
===================================================================
--- linux-2.6-git.orig/arch/um/include/sysdep-i386/sigcontext.h 2008-02-21 18:47:34.000000000 -0500
+++ linux-2.6-git/arch/um/include/sysdep-i386/sigcontext.h 2008-03-06 09:46:19.000000000 -0500
@@ -10,7 +10,7 @@

#define IP_RESTART_SYSCALL(ip) ((ip) -= 2)

-#define GET_FAULTINFO_FROM_SC(fi,sc) \
+#define GET_FAULTINFO_FROM_SC(fi, sc) \
{ \
(fi).cr2 = SC_CR2(sc); \
(fi).error_code = SC_ERR(sc); \
Index: linux-2.6-git/arch/um/kernel/um_arch.c
===================================================================
--- linux-2.6-git.orig/arch/um/kernel/um_arch.c 2008-02-21 18:47:34.000000000 -0500
+++ linux-2.6-git/arch/um/kernel/um_arch.c 2008-03-06 09:46:19.000000000 -0500
@@ -150,7 +150,7 @@ __uml_setup("root=", uml_root_setup,
static int __init no_skas_debug_setup(char *line, int *add)
{
printf("'debug' is not necessary to gdb UML in skas mode - run \n");
- printf("'gdb linux'");
+ printf("'gdb linux'\n");

return 0;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/