diff options
| author | Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it> | 2005-10-11 21:01:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-12 08:22:26 -0700 |
| commit | 9d624ea474a3ddf3a0702d9b47e428ce1f8488a6 (patch) | |
| tree | 6974b966b5da06e04597fc32a3b67fe0a8e0bafc /arch | |
| parent | 91acb21f084aa244f26839406ae7ed8aa3668058 (diff) | |
| download | op-kernel-dev-9d624ea474a3ddf3a0702d9b47e428ce1f8488a6.zip op-kernel-dev-9d624ea474a3ddf3a0702d9b47e428ce1f8488a6.tar.gz | |
[PATCH] uml: compile-time fix recent patch
Give an empty definition for clear_can_do_skas() when it is not needed.
Thanks to Junichi Uekawa <dancer@netfort.gr.jp> for reporting the
breakage and providing a fix (I re-fixed it in an IMHO cleaner way).
Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/um/include/os.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/um/include/os.h b/arch/um/include/os.h index 6f766e1..2e58e30 100644 --- a/arch/um/include/os.h +++ b/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); |
