All of lore.kernel.org
 help / color / mirror / Atom feed
* [uml-devel] [patch 4/8] uml: fixes a build failure with CONFIG_MODE_SKAS disabled [for 2.6.12]
@ 2005-03-30 17:33 ` blaisorblade
  0 siblings, 0 replies; 2+ messages in thread
From: blaisorblade @ 2005-03-30 17:33 UTC (permalink / raw)
  To: torvalds; +Cc: akpm, jdike, linux-kernel, user-mode-linux-devel, blaisorblade


This fixes a build failure (and also some warnings) when CONFIG_MODE_SKAS is
disabled.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
---

 linux-2.6.11-paolo/arch/um/include/sysdep-i386/ptrace.h   |   16 +++++++-------
 linux-2.6.11-paolo/arch/um/include/sysdep-x86_64/ptrace.h |    6 ++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff -puN arch/um/include/sysdep-i386/ptrace.h~uml-fix-comp-failure-config-mode-skas-disabled arch/um/include/sysdep-i386/ptrace.h
--- linux-2.6.11/arch/um/include/sysdep-i386/ptrace.h~uml-fix-comp-failure-config-mode-skas-disabled	2005-03-29 17:02:34.000000000 +0200
+++ linux-2.6.11-paolo/arch/um/include/sysdep-i386/ptrace.h	2005-03-29 17:02:34.000000000 +0200
@@ -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 @@ void set_using_sysemu(int value);
 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 -puN arch/um/include/sysdep-x86_64/ptrace.h~uml-fix-comp-failure-config-mode-skas-disabled arch/um/include/sysdep-x86_64/ptrace.h
--- linux-2.6.11/arch/um/include/sysdep-x86_64/ptrace.h~uml-fix-comp-failure-config-mode-skas-disabled	2005-03-29 17:02:34.000000000 +0200
+++ linux-2.6.11-paolo/arch/um/include/sysdep-x86_64/ptrace.h	2005-03-29 17:02:34.000000000 +0200
@@ -10,6 +10,9 @@
 #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
@@ -17,9 +20,6 @@
 #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])
 
_


-------------------------------------------------------
This SF.net email is sponsored by Demarc:
A global provider of Threat Management Solutions.
Download our HomeAdmin security software for free today!
http://www.demarc.com/info/Sentarus/hamr30
_______________________________________________
User-mode-linux-devel mailing list
User-mode-linux-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2005-03-30 18:51 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2005-03-30 17:33 [uml-devel] [patch 4/8] uml: fixes a build failure with CONFIG_MODE_SKAS disabled [for 2.6.12] blaisorblade
2005-03-30 17:33 ` blaisorblade

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.