From: Charles Manning <cdhmanning@gmail.com>
Date: Fri, 7 Jan 2011 01:13:13 +0000 (+1300)
Subject: yaffs: Fix trace ALWAYS problem and moduleconfig.h dependency
X-Git-Tag: linux-mainline-patchset-4~5^2~6
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=6a1296f4458cb8eff1535a8618f45379655e5aa5

yaffs: Fix trace ALWAYS problem and moduleconfig.h dependency

The yaffs trace macro was always tracing. Fixed by no longer forcing
ALWAYS on.

Only include moduleconfig.h if compiling out of tree.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
---

diff --git a/yportenv_multi.h b/yportenv_multi.h
index 4dddf63..10e284e 100644
--- a/yportenv_multi.h
+++ b/yportenv_multi.h
@@ -24,7 +24,9 @@
 
 #define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
 
+#ifdef YAFFS_OUT_OF_TREE
 #include "moduleconfig.h"
+#endif
 
 #include <linux/version.h>
 #define MTD_VERSION_CODE LINUX_VERSION_CODE
@@ -75,7 +77,7 @@
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \
-	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+	if(yaffs_trace_mask & (msk)) \
 		printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)
 
diff --git a/yportenv_single.h b/yportenv_single.h
index 236f579..8183425 100644
--- a/yportenv_single.h
+++ b/yportenv_single.h
@@ -54,7 +54,7 @@
 #endif
 
 #define yaffs_trace(msk, fmt, ...) do { \
-	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+	if(yaffs_trace_mask & (msk)) \
 		printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)