From 60cf4e42b3b3b3c5f58e841a20797925068fd3db Mon Sep 17 00:00:00 2001
From: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Date: Tue, 11 Oct 2005 21:01:01 +0200
Subject: [PATCH] --- yaml --- r: 9817 b: refs/heads/master c:
 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6 h: refs/heads/master i:   9815:
 da1f301f64ea8c8c455ff2e7af5d83f159744639 v: v3

---
 [refs]                     | 2 +-
 trunk/arch/um/include/os.h | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 87f431262954..5b170859c19f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91acb21f084aa244f26839406ae7ed8aa3668058
+refs/heads/master: 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6
diff --git a/trunk/arch/um/include/os.h b/trunk/arch/um/include/os.h
index 6f766e1faecc..2e58e304b8be 100644
--- a/trunk/arch/um/include/os.h
+++ b/trunk/arch/um/include/os.h
@@ -6,6 +6,7 @@
 #ifndef __OS_H__
 #define __OS_H__
 
+#include "uml-config.h"
 #include "asm/types.h"
 #include "../os/include/file.h"
 
@@ -159,7 +160,11 @@ extern int can_do_skas(void);
 
 /* Make sure they are clear when running in TT mode. Required by
  * SEGV_MAYBE_FIXABLE */
+#ifdef UML_CONFIG_MODE_SKAS
 #define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0)
+#else
+#define clear_can_do_skas() do {} while (0)
+#endif
 
 /* mem.c */
 extern int create_mem_file(unsigned long len);