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

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

[PATCH] uml: fix compilation for __CHOOSE_MODE addition 



I had added the __CHOOSE_MODE syntax to fix some warnings with newer GCC's
in the uml-fix-cond-expr-as-lvalues-warning patch.

Here is the update from the version I sent to make it work also when only
one mode (TT or SKAS) is enabled.

Signed-off-by: default avatarPaolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 43117a08

arch/um/include/choose-mode.h

+10 −17
Original line number Diff line number Diff line
@@ -11,6 +11,13 @@ 
#if defined(UML_CONFIG_MODE_TT) && defined(UML_CONFIG_MODE_SKAS)

#define CHOOSE_MODE(tt, skas) (mode_tt ? (tt) : (skas))



extern int mode_tt;

static inline void *__choose_mode(void *tt, void *skas) {

	return mode_tt ? tt : skas;

}



#define __CHOOSE_MODE(tt, skas) (*( (typeof(tt) *) __choose_mode(&(tt), &(skas))))



#elif defined(UML_CONFIG_MODE_SKAS)

#define CHOOSE_MODE(tt, skas) (skas)
@@ -21,22 +28,8 @@ 
#define CHOOSE_MODE_PROC(tt, skas, args...) \

	CHOOSE_MODE(tt(args), skas(args))



extern int mode_tt;

static inline void *__choose_mode(void *tt, void *skas) {

	return mode_tt ? tt : skas;

}



#define __CHOOSE_MODE(tt, skas) (*( (typeof(tt) *) __choose_mode(&(tt), &(skas))))



#ifndef __CHOOSE_MODE

#define __CHOOSE_MODE(tt, skas) CHOOSE_MODE(tt, skas)

#endif



/*

 * Overrides for Emacs so that we follow Linus's tabbing style.

 * Emacs will notice this stuff at the end of the file and automatically

 * adjust the settings for this buffer only.  This must remain at the end

 * of the file.

 * ---------------------------------------------------------------------------

 * Local variables:

 * c-file-style: "linux"

 * End:

 */
 
#endif