diff options
| author | Paolo \'Blaisorblade\' Giarrusso <blaisorblade@yahoo.it> | 2005-03-30 16:35:54 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-03-30 16:35:54 -0800 |
| commit | b5ee361de4568bc22f11673476c8b0df04e5e366 (patch) | |
| tree | 9f58cfc6e52cf741282c1431c17a032c7122bdf9 | |
| parent | 784652cfa6dc6714ecf69f5c9ea9b5f3566a0202 (diff) | |
| download | history-b5ee361de4568bc22f11673476c8b0df04e5e366.tar.gz | |
[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 <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | arch/um/include/sysdep-i386/ptrace.h | 16 | ||||
| -rw-r--r-- | arch/um/include/sysdep-x86_64/ptrace.h | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/sysdep-i386/ptrace.h index b514ea28d16c4b..661d495e204488 100644 --- a/arch/um/include/sysdep-i386/ptrace.h +++ b/arch/um/include/sysdep-i386/ptrace.h @@ -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 --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/sysdep-x86_64/ptrace.h index 5eac9bed21ad39..915c82daffbd6b 100644 --- a/arch/um/include/sysdep-x86_64/ptrace.h +++ b/arch/um/include/sysdep-x86_64/ptrace.h @@ -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]) |