From patchwork Fri Mar 6 21:24:46 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 897 Return-path: X-OfflineIMAP-x1369581045-426f6d626164696c-494e424f582e6c696e75782d6d65646961: 1241212836-024691336684-v6.0.3 X-OfflineIMAP-x320741636-4c6f63616c-496e667261646561642e6c696e75782d6d65646961: 1241139157-0103549229301-v6.0.3 Envelope-to: mchehab@infradead.org Delivery-date: Fri, 06 Mar 2009 22:01:49 +0000 Received: from vger.kernel.org ([209.132.176.167]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1LfhtC-0008Bw-8p for mchehab@infradead.org; Fri, 06 Mar 2009 21:47:30 +0000 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753768AbZCFVYJ (ORCPT ); Fri, 6 Mar 2009 16:24:09 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754632AbZCFVYJ (ORCPT ); Fri, 6 Mar 2009 16:24:09 -0500 Received: from rcsinet11.oracle.com ([148.87.113.123]:52789 "EHLO rgminet11.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753768AbZCFVYH (ORCPT ); Fri, 6 Mar 2009 16:24:07 -0500 Received: from acsinet13.oracle.com (acsinet13.oracle.com [141.146.126.235]) by rgminet11.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n26LPoR0001702 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 6 Mar 2009 21:25:52 GMT Received: from acsmt705.oracle.com (acsmt705.oracle.com [141.146.40.83]) by acsinet13.oracle.com (Switch-3.3.1/Switch-3.3.1) with ESMTP id n26LNIZv031642; Fri, 6 Mar 2009 21:23:20 GMT Received: from [192.168.1.4] (/71.117.247.66) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 06 Mar 2009 21:23:04 +0000 Message-ID: <49B1949E.2000300@oracle.com> Date: Fri, 06 Mar 2009 13:24:46 -0800 From: Randy Dunlap Organization: Oracle Linux Engineering User-Agent: Thunderbird 2.0.0.6 (X11/20070801) MIME-Version: 1.0 To: Stephen Rothwell CC: linux-next@vger.kernel.org, LKML , linux-media@vger.kernel.org, Mauro Carvalho Chehab , Andrew Morton Subject: [PATCH -next] dvb/frontends: fix duplicate 'debug' symbol References: <20090306191311.697e7b97.sfr@canb.auug.org.au> In-Reply-To: <20090306191311.697e7b97.sfr@canb.auug.org.au> X-Source-IP: acsmt705.oracle.com [141.146.40.83] X-Auth-Type: Internal IP X-CT-RefId: str=0001.0A090202.49B1943A.01AE:SCFSTAT928724,ss=1,fgs=0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From: Randy Dunlap 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 --- drivers/media/dvb/frontends/stv0900_core.c | 4 ++-- drivers/media/dvb/frontends/stv0900_priv.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- 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)