From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21836 invoked by alias); 7 Oct 2008 06:38:31 -0000 Received: (qmail 21826 invoked by uid 22791); 7 Oct 2008 06:38:30 -0000 X-Spam-Status: No, hits=4.2 required=5.0 tests=AWL,BAYES_00,BOTNET X-Spam-Check-By: sourceware.org Received: from cn.fujitsu.com (HELO song.cn.fujitsu.com) (222.73.24.84) by sourceware.org (qpsmtpd/0.31) with ESMTP; Tue, 07 Oct 2008 06:37:55 +0000 Received: from tang.cn.fujitsu.com (tang.cn.fujitsu.com [10.167.250.3]) by song.cn.fujitsu.com (Postfix) with ESMTP id 68F41170143; Tue, 7 Oct 2008 14:37:46 +0800 (CST) Received: from fnst.cn.fujitsu.com (localhost.localdomain [127.0.0.1]) by tang.cn.fujitsu.com (8.13.1/8.13.1) with ESMTP id m976bj8A020352; Tue, 7 Oct 2008 14:37:45 +0800 Received: from [127.0.0.1] (unknown [10.167.141.61]) by fnst.cn.fujitsu.com (Postfix) with ESMTPA id 5DD2CD4268; Tue, 7 Oct 2008 14:41:49 +0800 (CST) Message-ID: <48EB032B.3070200@cn.fujitsu.com> Date: Tue, 07 Oct 2008 06:38:00 -0000 From: Lai Jiangshan User-Agent: Thunderbird 2.0.0.17 (Windows/20080914) MIME-Version: 1.0 To: Andrew Morton , Greg KH CC: stable@kernel.org, Linux Kernel Mailing List , Mathieu Desnoyers , Roland McGrath , Wenji Huang , Takashi Nishiie , systemtap@sourceware.org Subject: [PATCH] markers: fix missing modpost entry in Module.markers Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit 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-q4/txt/msg00064.txt.bz2 commit d35cb360c29956510b2fe1a953bd4968536f7216 brought a bug. marker points compiled in vmlinux are missing in Module.markers. # cat Module.markers subsystem_event samples/markers/marker-example integer %d string %s subsystem_eventb samples/markers/marker-example # stap -e 'probe kernel.mark("core_marker_format"){} ' semantic error: no match while resolving probe point kernel.mark("core_marker_format") semantic error: no probes found Pass 2: analysis failed. Try again with more '-v' (verbose) options. This patch revert a part of d35cb360c29956510b2fe1a953bd4968536f7216. Other parts have fixed duplicate modpost entry bug. Signed-off-by: Lai Jiangshan --- diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 418cd7d..3509142 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1992,8 +1992,7 @@ static void read_markers(const char *fname) mod->skip = 1; } - if (!mod->skip) - add_marker(mod, marker, fmt); + add_marker(mod, marker, fmt); } return; fail: