tree 35ee317dd45aab96021256b8fdb06c90a05b3002
parent 43117a08280e40be43e181c51cce296ef4b4c7e5
author Paolo 'Blaisorblade' Giarrusso <[EMAIL PROTECTED]> Sun, 17 Apr 2005
05:25:39 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:25:39 -0700
[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]>
um/include/choose-mode.h | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 deletions(-)
Index: arch/um/include/choose-mode.h
===================================================================
--- 88b50248e7a9b690c44fd7ab5e7b3989534bc552/arch/um/include/choose-mode.h
(mode:100644 sha1:8e6b62f5e9ac2a1e5ec77a2ac6b89d2b853d74c1)
+++ 35ee317dd45aab96021256b8fdb06c90a05b3002/arch/um/include/choose-mode.h
(mode:100644 sha1:f25fa83a5da66eb06b6575342d736729d7a40ccf)
@@ -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
