提交 5a771cb1 编写于 作者: R Randy Dunlap 提交者: Mauro Carvalho Chehab

V4L/DVB (10846): dvb/frontends: fix duplicate 'debug' symbol

Fix dvb frontend debug variable to be static, to avoid linker
errors:

drivers/built-in.o:(.data+0xf4b0): multiple definition of `debug'
arch/x86/kernel/built-in.o:(.kprobes.text+0x90): first defined here
ld: Warning: size of symbol `debug' changed from 85 in arch/x86/kernel/built-in.o to 4 in drivers/built-in.o

It would also be Good if arch/x86/kernel/entry_32.S didn't have a
non-static 'debug' symbol.  OTOH, it helps catch things like this one.
Signed-off-by: NRandy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 632fe9fe
......@@ -34,8 +34,8 @@
#include "stv0900_priv.h"
#include "stv0900_init.h"
int debug = 1;
module_param(debug, int, 0644);
static int stvdebug = 1;
module_param_named(debug, stvdebug, int, 0644);
/* internal params node */
struct stv0900_inode {
......
......@@ -62,11 +62,11 @@
#define dmd_choose(a, b) (demod = STV0900_DEMOD_2 ? b : a))
extern int debug;
static int stvdebug;
#define dprintk(args...) \
do { \
if (debug) \
if (stvdebug) \
printk(KERN_DEBUG args); \
} while (0)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册