[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>
This commit is contained in:
parent
91acb21f08
commit
9d624ea474
|
@ -6,6 +6,7 @@
|
||||||
#ifndef __OS_H__
|
#ifndef __OS_H__
|
||||||
#define __OS_H__
|
#define __OS_H__
|
||||||
|
|
||||||
|
#include "uml-config.h"
|
||||||
#include "asm/types.h"
|
#include "asm/types.h"
|
||||||
#include "../os/include/file.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
|
/* Make sure they are clear when running in TT mode. Required by
|
||||||
* SEGV_MAYBE_FIXABLE */
|
* SEGV_MAYBE_FIXABLE */
|
||||||
|
#ifdef UML_CONFIG_MODE_SKAS
|
||||||
#define clear_can_do_skas() do { ptrace_faultinfo = proc_mm = 0; } while (0)
|
#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 */
|
/* mem.c */
|
||||||
extern int create_mem_file(unsigned long len);
|
extern int create_mem_file(unsigned long len);
|
||||||
|
|
Loading…
Reference in New Issue