- sound-update-snd_assert-macro.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled
     sound: update snd_assert macro
has been removed from the -mm tree.  Its filename was
     sound-update-snd_assert-macro.patch

This patch was dropped because snd_assert got removed

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: sound: update snd_assert macro
From: Steven Rostedt <rostedt@xxxxxxxxxxx>

One user of the snd_assert macro calls a goto and the compiler complains
that the label is not used when the snd_assert is not set.

This patch makes snd_assert more robust when not defined to let the
compiler know about arguments when not in use.

Cc: Takashi Iwai <tiwai@xxxxxxx>
Signed-off-by: Steven Rostedt <srostedt@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---

 include/sound/core.h |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff -puN include/sound/core.h~sound-update-snd_assert-macro include/sound/core.h
--- a/include/sound/core.h~sound-update-snd_assert-macro
+++ a/include/sound/core.h
@@ -407,7 +407,13 @@ void snd_verbose_printd(const char *file
 #else /* !CONFIG_SND_DEBUG */
 
 #define snd_printd(fmt, args...)	/* nothing */
-#define snd_assert(expr, args...)	(void)(expr)
+/* Keep the compiler happy by showing the expr and args */
+#define snd_assert(expr, args...)	do {	\
+	if (0) {				\
+		(void)(expr);			\
+		args;				\
+	}					\
+} while(0)
 #define snd_BUG()			/* nothing */
 
 #endif /* CONFIG_SND_DEBUG */
_

Patches currently in -mm which might be from rostedt@xxxxxxxxxxx are

git-x86.patch
git-ftrace.patch
sound-update-snd_assert-macro.patch
ftrace-warn-on-failure-to-disable-mcount-callers.patch

--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux