Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d624ea4 authored by Paolo 'Blaisorblade' Giarrusso's avatar Paolo 'Blaisorblade' Giarrusso Committed by Linus Torvalds
Browse files

[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: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 91acb21f

arch/um/include/os.h

+5 −0
Original line number Diff line number Diff line
@@ -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);