diff options
| author | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
|---|---|---|
| committer | Brian Norris <computersforpeace@gmail.com> | 2016-10-28 19:05:25 -0700 |
| commit | 0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854 (patch) | |
| tree | a3413237c8dee15dfe620848fecb37408a096345 /fs/ext4/mballoc.h | |
| parent | 30656167bd2347bf867a09cbae2705bd927d3983 (diff) | |
| parent | 8ff0513bdcdd71e84aa561cce216675d43fb41b8 (diff) | |
| download | talos-obmc-linux-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.tar.gz talos-obmc-linux-0e2ce9d3fcba5f92dd6c2b27d82690e49d0c0854.zip | |
Merge tag 'nand/fixes-for-4.9-rc3' of github.com:linux-nand/linux
From Boris:
"""
Three simple fixes:
- the first one is fixing a non-critical bug in the gpmi driver
- the second one is fixing a bug in the 'automatic NAND timings
selection' feature introduced in 4.9-rc1
- the last one is fixing a false positive uninitialized-var warning
"""
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'fs/ext4/mballoc.h')
| -rw-r--r-- | fs/ext4/mballoc.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/fs/ext4/mballoc.h b/fs/ext4/mballoc.h index 3ef1df6ae9ec..1aba469f8220 100644 --- a/fs/ext4/mballoc.h +++ b/fs/ext4/mballoc.h @@ -27,16 +27,15 @@ #ifdef CONFIG_EXT4_DEBUG extern ushort ext4_mballoc_debug; -#define mb_debug(n, fmt, a...) \ - do { \ - if ((n) <= ext4_mballoc_debug) { \ - printk(KERN_DEBUG "(%s, %d): %s: ", \ - __FILE__, __LINE__, __func__); \ - printk(fmt, ## a); \ - } \ - } while (0) +#define mb_debug(n, fmt, ...) \ +do { \ + if ((n) <= ext4_mballoc_debug) { \ + printk(KERN_DEBUG "(%s, %d): %s: " fmt, \ + __FILE__, __LINE__, __func__, ##__VA_ARGS__); \ + } \ +} while (0) #else -#define mb_debug(n, fmt, a...) no_printk(fmt, ## a) +#define mb_debug(n, fmt, ...) no_printk(fmt, ##__VA_ARGS__) #endif #define EXT4_MB_HISTORY_ALLOC 1 /* allocation */ |
