From 058af91f661bb852012c8322b3d0933308b09347 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Mon, 12 May 2008 14:01:48 -0700
Subject: [PATCH] --- yaml --- r: 96447 b: refs/heads/master c:
 96cee3044dca2e6510ca7cc276d1eac34a1cfd51 h: refs/heads/master i:   96445:
 766966f9d9f0641808b1413865610dc6b4f8ef2f   96443:
 959ba8778013506e8b8cf7774890f17344a2c8cb   96439:
 ab254710cf0562132ce26ab1f6e3799ee3ce0352   96431:
 b927c06fa04265b725b93c67659f0a14233429a2   96415:
 65338cf41ef800ac11b9c0ef187b18b77c802cd6   96383:
 1fe475226050a2aa9ba39e24fd23f53726a6b26c v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/um/include/skas_ptrace.h            | 13 +------------
 trunk/arch/um/include/sysdep-i386/sigcontext.h |  2 +-
 trunk/arch/um/kernel/um_arch.c                 |  2 +-
 trunk/arch/um/os-Linux/skas/process.c          |  2 +-
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index bcb6877c5ddb..14c144b24d83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53c258787427ea43ebfa76fefa6534cae507e521
+refs/heads/master: 96cee3044dca2e6510ca7cc276d1eac34a1cfd51
diff --git a/trunk/arch/um/include/skas_ptrace.h b/trunk/arch/um/include/skas_ptrace.h
index cd2327d09c8d..3d31bbacd016 100644
--- a/trunk/arch/um/include/skas_ptrace.h
+++ b/trunk/arch/um/include/skas_ptrace.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000, 2001, 2002 Jeff Dike (jdike@karaya.com)
+ * 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:
- */
diff --git a/trunk/arch/um/include/sysdep-i386/sigcontext.h b/trunk/arch/um/include/sysdep-i386/sigcontext.h
index 67e77122aa45..f583c87111a0 100644
--- a/trunk/arch/um/include/sysdep-i386/sigcontext.h
+++ b/trunk/arch/um/include/sysdep-i386/sigcontext.h
@@ -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); \
diff --git a/trunk/arch/um/kernel/um_arch.c b/trunk/arch/um/kernel/um_arch.c
index 56deed623446..82058ac7d481 100644
--- a/trunk/arch/um/kernel/um_arch.c
+++ b/trunk/arch/um/kernel/um_arch.c
@@ -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;
 }
diff --git a/trunk/arch/um/os-Linux/skas/process.c b/trunk/arch/um/os-Linux/skas/process.c
index 1e8cba6550a9..6be028ca1817 100644
--- a/trunk/arch/um/os-Linux/skas/process.c
+++ b/trunk/arch/um/os-Linux/skas/process.c
@@ -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();
 			}