tree d2986d713f4f08c1d74770d24551e174ccfdb4ae
parent 8137d411cf4d73d3b29b294d70dbbec251144705
author Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]> Tue Apr 12 08:26:08
2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:26:08 2005
[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: Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
choose-mode.h | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
Index: arch/um/include/choose-mode.h
===================================================================
--- 155ddbc90f10313c0c20e74420b699bd8ec7e3f7/arch/um/include/choose-mode.h
(mode:100644 sha1:ca320cde2988fac3ba270742c5cda606568d96e2)
+++ d2986d713f4f08c1d74770d24551e174ccfdb4ae/arch/um/include/choose-mode.h
(mode:100644 sha1:da0fa8721f81d08a4ca1ac82adb39fe4f282fba7)
@@ -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
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
