From patchwork Mon Oct 18 21:26:53 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: 263501
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 o9ILQuNi003300
	for <patchwork-kbuild@patchwork.kernel.org>;
	Mon, 18 Oct 2010 21:26:57 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S933188Ab0JRV0z (ORCPT
	<rfc822;patchwork-kbuild@patchwork.kernel.org>);
	Mon, 18 Oct 2010 17:26:55 -0400
Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:39060 "EHLO
	hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by
	vger.kernel.org with ESMTP id S933126Ab0JRV0z (ORCPT
	<rfc822;linux-kbuild@vger.kernel.org>);
	Mon, 18 Oct 2010 17:26:55 -0400
X-Authority-Analysis: v=1.1 cv=QISHQ+x4xS+apxgDHgAvNvlUjyrXCzYsHvuXcbPYiKg=
	c=1 sm=0 a=OrGMES_b0tgA:10 a=Q9fys5e9bTEA:10
	a=OPBmh+XkhLl+Enan7BmTLg==:17 a=VwQbUJbxAAAA:8
	a=20KFwNOVAAAA:8 a=7gkXJVJtAAAA:8 a=meVymXHHAAAA:8
	a=WpJrq3Wj8nnjNOLwjU4A:9 a=gqfhFpUgW0abB67MVfcA:7
	a=KC6nLmr-wN_Nnoe8ipI9NQBE3QMA:4 a=PUjeQqilurYA:10
	a=jEp0ucaQiEUA:10 a=JmBWkid0h3cA: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:49508] 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 78/C6-11377-D9BBCBC4; Mon, 18 Oct 2010 21:26:54 +0000
Subject: [PATCH v2][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>, Andrew Morton <akpm@linux-foundation.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	Sam Ravnborg <sam@ravnborg.org>, Michal Marek <mmarek@suse.cz>,
	linux-kbuild <linux-kbuild@vger.kernel.org>
Date: Mon, 18 Oct 2010 17:26:53 -0400
Message-ID: <1287437213.16971.333.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 21:26:57 +0000 (UTC)


diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 4db60b2..843bd4f 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -210,7 +210,13 @@ endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 ifdef BUILD_C_RECORDMCOUNT
-cmd_record_mcount = $(objtree)/scripts/recordmcount "$(@)";
+# Due to recursion, we must skip empty.o.
+# The empty.o file is created in the make process in order to determine
+#  the target endianness and word size. It is made before all other C
+#  files, including recordmcount.
+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)" \