From: Charles Manning <cdhmanning@gmail.com>
Date: Mon, 10 Jan 2011 22:58:02 +0000 (+1300)
Subject: Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2
X-Git-Tag: linux-mainline-patchset-4~5
X-Git-Url: https://yaffs.net/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=05f5305b2d17b0e2889338724b864cf80f309437;hp=-c

Merge branch 'master' of ssh://aleph1.co.uk/home/aleph1/git/yaffs2
---

05f5305b2d17b0e2889338724b864cf80f309437
diff --combined direct/ydirectenv.h
index 3c6ddf5,7063fa6..ad4efab
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@@ -53,15 -53,15 +53,15 @@@ void yaffs_qsort(void *aa, size_t n, si
  #define inline __inline__
  #endif
  
 -#define kmalloc(x,flags) yaffs_malloc(x)
 -#define kfree(x)   yaffs_free(x)
 -#define vmalloc(x) yaffs_malloc(x)
 -#define vfree(x) yaffs_free(x)
 +#define kmalloc(x,flags) yaffsfs_malloc(x)
 +#define kfree(x)   yaffsfs_free(x)
 +#define vmalloc(x) yaffsfs_malloc(x)
 +#define vfree(x) yaffsfs_free(x)
  
  #define cond_resched()  do {} while(0)
  
  #define yaffs_trace(msk, fmt, ...) do { \
- 	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+ 	if(yaffs_trace_mask & (msk)) \
  		printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
  } while(0)