From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21063 invoked by alias); 20 Mar 2008 08:29:07 -0000 Received: (qmail 21049 invoked by uid 22791); 20 Mar 2008 08:29:06 -0000 X-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Thu, 20 Mar 2008 08:28:47 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m2K8Sje5020250 for ; Thu, 20 Mar 2008 04:28:45 -0400 Received: from gateway.sf.frob.com (vpn-14-172.rdu.redhat.com [10.11.14.172]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m2K8Si0U018692 for ; Thu, 20 Mar 2008 04:28:44 -0400 Received: from magilla.localdomain (magilla.sf.frob.com [198.49.250.228]) by gateway.sf.frob.com (Postfix) with ESMTP id 7DCD8357B; Thu, 20 Mar 2008 00:28:43 -0800 (PST) Received: by magilla.localdomain (Postfix, from userid 5281) id 4F25526F995; Thu, 20 Mar 2008 01:28:43 -0700 (PDT) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit From: Roland McGrath To: Mathieu Desnoyers Cc: Wenji Huang , systemtap@sources.redhat.com Subject: Re: Bug: duplicate marker entry in Modules.marker In-Reply-To: Mathieu Desnoyers's message of Wednesday, 19 March 2008 21:05:22 -0400 <20080320010521.GA7633@Krystal> References: <20080129160005.GA5561@Krystal> <47E080D0.2030800@oracle.com> <20080319030718.82AD926F995@magilla.localdomain> <47E0C4BA.6070703@oracle.com> <20080319080227.6CC9026F9A2@magilla.localdomain> <20080320010521.GA7633@Krystal> X-Antipastobozoticataclysm: When George Bush projectile vomits antipasto on the Japanese. Message-Id: <20080320082843.4F25526F995@magilla.localdomain> Date: Thu, 20 Mar 2008 08:29:00 -0000 X-Scanned-By: MIMEDefang 2.58 on 172.16.52.254 X-IsSubscribed: yes Mailing-List: contact systemtap-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: systemtap-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00482.txt.bz2 If marker names are unique, then it's easy to deal with. When I was doing the modpost hack, I think I recall seeing something with an overloaded name used with two different formats. I thought it was nutty, but that it appeared to be the plan. So I made modpost only look for duplicates of the whole "name module format" line. Come to think of it, maybe it's easy to deal with another way anyhow. All the lines from the old file that use the module name we are processing now should be replaced, right? What about this? Thanks, Roland diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 695b5d6..e23147b 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1973,7 +1973,8 @@ static void read_markers(const char *fname) mod->skip = 1; } - add_marker(mod, marker, fmt); + if (!mod->skip) + add_marker(mod, marker, fmt); } return; fail: