LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
	linux-media@vger.kernel.org,
	Mauro Carvalho Chehab <mchehab@infradead.org>,
	Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol
Date: Fri, 06 Mar 2009 13:24:46 -0800	[thread overview]
Message-ID: <49B1949E.2000300@oracle.com> (raw)
In-Reply-To: <20090306191311.697e7b97.sfr@canb.auug.org.au>

From: Randy Dunlap <randy.dunlap@oracle.com>

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>
---
 drivers/media/dvb/frontends/stv0900_core.c |    4 ++--
 drivers/media/dvb/frontends/stv0900_priv.h |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

--- linux-next-20090306.orig/drivers/media/dvb/frontends/stv0900_core.c
+++ linux-next-20090306/drivers/media/dvb/frontends/stv0900_core.c
@@ -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 {
--- linux-next-20090306.orig/drivers/media/dvb/frontends/stv0900_priv.h
+++ linux-next-20090306/drivers/media/dvb/frontends/stv0900_priv.h
@@ -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)
 

  parent reply	other threads:[~2009-03-06 21:24 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-03-06  8:13 linux-next: Tree for March 6 Stephen Rothwell
2009-03-06 19:01 ` linux-next: Tree for March 6 (ath9k) Randy Dunlap
2009-03-06 19:35   ` Gabor Juhos
2009-03-06 19:41     ` Randy Dunlap
2009-03-06 19:40       ` John W. Linville
2009-03-11 17:19         ` Randy Dunlap
2009-03-11 18:19           ` John W. Linville
2009-03-06 19:24 ` linux-next: Tree for March 6 Andrew Morton
2009-03-10  5:47   ` Stephen Rothwell
2009-03-06 21:24 ` Randy Dunlap [this message]
2009-03-06 23:59   ` [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol Andrew Morton
2009-03-07  0:05     ` Randy Dunlap

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=49B1949E.2000300@oracle.com \
    --to=randy.dunlap@oracle.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mchehab@infradead.org \
    --cc=sfr@canb.auug.org.au \
    --subject='Re: [PATCH -next] dvb/frontends: fix duplicate '\''debug'\'' symbol' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).