From patchwork Mon Oct 18 18:53:09 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Steven Rostedt <rostedt@goodmis.org>
X-Patchwork-Id: 262661
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9IIrI0o012801
	for <patchwork-kbuild@patchwork.kernel.org>;
	Mon, 18 Oct 2010 18:53:18 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755758Ab0JRSxR (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Mon, 18 Oct 2010 14:53:17 -0400
Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:61192 "EHLO
	hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by
	vger.kernel.org with ESMTP id S1755694Ab0JRSxQ (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Mon, 18 Oct 2010 14:53:16 -0400
X-Authority-Analysis: v=1.1 cv=QISHQ+x4xS+apxgDHgAvNvlUjyrXCzYsHvuXcbPYiKg=
	c=1 sm=0 a=G0887j_XUbsA:10 a=Q9fys5e9bTEA:10
	a=OPBmh+XkhLl+Enan7BmTLg==:17 a=VwQbUJbxAAAA:8
	a=20KFwNOVAAAA:8 a=meVymXHHAAAA:8 a=WxeYqwZE9sgaEedjxjQA:9
	a=eMqUIF2LdeiKly0AJdoA:7 a=ngE_fJCJClL8bYJCE89bRmVuRzwA:4
	a=PUjeQqilurYA:10 a=jEp0ucaQiEUA:10 a=jeBq3FmKZ4MA:10
	a=OPBmh+XkhLl+Enan7BmTLg==:117
X-Cloudmark-Score: 0
X-Originating-IP: 67.242.120.143
Received: from [67.242.120.143] ([67.242.120.143:36378] helo=[192.168.23.10])
	by hrndva-oedge04.mail.rr.com (envelope-from <rostedt@goodmis.org>)
	(ecelerity 2.2.3.46 r()) with ESMTP
	id 00/0A-11377-5979CBC4; Mon, 18 Oct 2010 18:53:10 +0000
Subject: [PATCH][GIT PULL] ftrace: Remove recursion between recordmcount
	and scripts/mod/empty
From: Steven Rostedt <rostedt@goodmis.org>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>, Frederic Weisbecker <fweisbec@gmail.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Michal Marek <mmarek@suse.cz>, linux-kbuild@vger.kernel.org,
	Sam Ravnborg <sam@ravnborg.org>
Date: Mon, 18 Oct 2010 14:53:09 -0400
Message-ID: <1287427989.16971.304.camel@gandalf.stny.rr.com>
Mime-Version: 1.0
X-Mailer: Evolution 2.30.3 
Sender: linux-kbuild-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kbuild.vger.kernel.org>
X-Mailing-List: linux-kbuild@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Mon, 18 Oct 2010 18:53:18 +0000 (UTC)


diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 4db60b2..9f2d5b4 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -210,7 +210,11 @@ endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 ifdef BUILD_C_RECORDMCOUNT
-cmd_record_mcount = $(objtree)/scripts/recordmcount "$(@)";
+# Due to recursion, we must skip the empty.o file
+#  TBD: Find a better way to do this.
+cmd_record_mcount = if [ $(@) != "scripts/mod/empty.o" ]; then			\
+			$(objtree)/scripts/recordmcount "$(@)";			\
+		    fi;
 else
 cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
 	"$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \