renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-22 12:14:01 +08:00
Code

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

Browse Source 
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: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Randy Dunlap 2009-03-08 23:01:08 -03:00 committed by Mauro Carvalho Chehab
parent 632fe9fe44
commit 5a771cb186
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/dvb/frontends/stv0900_core.c
View File

@ -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 {

4
drivers/media/dvb/frontends/stv0900_priv.h
View File

@ -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)