Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[media] s5p_mfc: don't use an external symbol called 'debug'

The 'debug' name is known to cause conflicts with allyesconfig
on several archs. So, localize its name.

>> drivers/built-in.o:(.bss+0xc7ee2c): multiple definition of `debug'
arch/x86/built-in.o:(.entry.text+0xf78): first defined here
ld: Warning: size of symbol `debug' changed from 86 in arch/x86/built-in.o to 4 in drivers/built-in.o

While here, fix a wrong file name reference

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

+5 -5
+2 -2
drivers/media/platform/s5p-mfc/s5p_mfc.c
··· 37 37 #define S5P_MFC_DEC_NAME "s5p-mfc-dec" 38 38 #define S5P_MFC_ENC_NAME "s5p-mfc-enc" 39 39 40 - int debug; 41 - module_param(debug, int, S_IRUGO | S_IWUSR); 40 + int mfc_debug_level; 41 + module_param_named(debug, mfc_debug_level, int, S_IRUGO | S_IWUSR); 42 42 MODULE_PARM_DESC(debug, "Debug level - higher value produces more verbose messages"); 43 43 44 44 /* Helper functions for interrupt processing */
+3 -3
drivers/media/platform/s5p-mfc/s5p_mfc_debug.h
··· 1 1 /* 2 - * drivers/media/platform/samsung/mfc5/s5p_mfc_debug.h 2 + * drivers/media/platform/s5p-mfc/s5p_mfc_debug.h 3 3 * 4 4 * Header file for Samsung MFC (Multi Function Codec - FIMV) driver 5 5 * This file contains debug macros ··· 18 18 #define DEBUG 19 19 20 20 #ifdef DEBUG 21 - extern int debug; 21 + extern int mfc_debug_level; 22 22 23 23 #define mfc_debug(level, fmt, args...) \ 24 24 do { \ 25 - if (debug >= level) \ 25 + if (mfc_debug_level >= level) \ 26 26 printk(KERN_DEBUG "%s:%d: " fmt, \ 27 27 __func__, __LINE__, ##args); \ 28 28 } while (0)