ChangeSet 1.2258, 2005/03/31 08:35:54-08:00, [EMAIL PROTECTED]
[PATCH] uml: fixes a build failure with CONFIG_MODE_SKAS disabled
This fixes a build failure (and also some warnings) when
CONFIG_MODE_SKAS is
disabled.
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
sysdep-i386/ptrace.h | 16 ++++++++--------
sysdep-x86_64/ptrace.h | 6 +++---
2 files changed, 11 insertions(+), 11 deletions(-)
diff -Nru a/arch/um/include/sysdep-i386/ptrace.h
b/arch/um/include/sysdep-i386/ptrace.h
--- a/arch/um/include/sysdep-i386/ptrace.h 2005-03-31 10:17:05 -08:00
+++ b/arch/um/include/sysdep-i386/ptrace.h 2005-03-31 10:17:05 -08:00
@@ -9,15 +9,11 @@
#include "uml-config.h"
#include "user_constants.h"
-#ifdef UML_CONFIG_MODE_TT
-#include "sysdep/sc.h"
-#endif
-
-#ifdef UML_CONFIG_MODE_SKAS
-
#define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long))
#define MAX_REG_OFFSET (UM_FRAME_SIZE)
+extern void update_debugregs(int seq);
+
/* syscall emulation path in ptrace */
#ifndef PTRACE_SYSEMU
@@ -28,9 +24,13 @@
int get_using_sysemu(void);
extern int sysemu_supported;
-#include "skas_ptregs.h"
+#ifdef UML_CONFIG_MODE_TT
+#include "sysdep/sc.h"
+#endif
-extern void update_debugregs(int seq);
+#ifdef UML_CONFIG_MODE_SKAS
+
+#include "skas_ptregs.h"
#define REGS_IP(r) ((r)[HOST_IP])
#define REGS_SP(r) ((r)[HOST_SP])
diff -Nru a/arch/um/include/sysdep-x86_64/ptrace.h
b/arch/um/include/sysdep-x86_64/ptrace.h
--- a/arch/um/include/sysdep-x86_64/ptrace.h 2005-03-31 10:17:05 -08:00
+++ b/arch/um/include/sysdep-x86_64/ptrace.h 2005-03-31 10:17:05 -08:00
@@ -10,15 +10,15 @@
#include "uml-config.h"
#include "user_constants.h"
+#define MAX_REG_OFFSET (UM_FRAME_SIZE)
+#define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long))
+
#ifdef UML_CONFIG_MODE_TT
#include "sysdep/sc.h"
#endif
#ifdef UML_CONFIG_MODE_SKAS
#include "skas_ptregs.h"
-
-#define MAX_REG_OFFSET (UM_FRAME_SIZE)
-#define MAX_REG_NR ((MAX_REG_OFFSET) / sizeof(unsigned long))
#define REGS_IP(r) ((r)[HOST_IP])
#define REGS_SP(r) ((r)[HOST_SP])
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
