From patchwork Wed Nov 19 21:22:12 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 9649 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 4898C481F4 for ; Thu, 20 Nov 2008 08:26:29 +1100 (EST) X-Original-To: linuxppc-dev@ozlabs.org Delivered-To: linuxppc-dev@ozlabs.org Received: from hrndva-omtalb.mail.rr.com (hrndva-omtalb.mail.rr.com [71.74.56.123]) by ozlabs.org (Postfix) with ESMTP id DA682DDE1B for ; Thu, 20 Nov 2008 08:23:36 +1100 (EST) Received: from gandalf.stny.rr.com ([74.67.89.75]) by hrndva-omta05.mail.rr.com with ESMTP id <20081119212335.WORV23613.hrndva-omta05.mail.rr.com@gandalf.stny.rr.com>; Wed, 19 Nov 2008 21:23:35 +0000 Received: from rostedt by gandalf.stny.rr.com with local (Exim 4.69) (envelope-from ) id 1L2uWM-0001oc-MD; Wed, 19 Nov 2008 16:23:34 -0500 Message-Id: <20081119212334.535779903@goodmis.org> References: <20081119212204.318400312@goodmis.org> User-Agent: quilt/0.46-1 Date: Wed, 19 Nov 2008 16:22:12 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Subject: [PATCH 8/9] powerpc/ppc32: ftrace, enabled dynamic ftrace Content-Disposition: inline; filename=0008-powerpc-ppc32-ftrace-enabled-dynamic-ftrace.patch Cc: Andrew Morton , Milton Miller , linuxppc-dev@ozlabs.org, Steven Rostedt , Paul Mackerras , Thomas Gleixner , Ingo Molnar X-BeenThere: linuxppc-dev@ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org Impact: Port 32 bit PowerPC dynamic ftrace This patch adds the necessary hooks to get PPC32 dynamic ftrace working. It does not handle modules. They are ignored by this patch. Signed-off-by: Steven Rostedt --- arch/powerpc/Kconfig | 2 +- scripts/recordmcount.pl | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9675e95..d64b629 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -108,7 +108,7 @@ config ARCH_NO_VIRT_TO_BUS config PPC bool default y - select HAVE_FTRACE_MCOUNT_RECORD if PPC64 + select HAVE_FTRACE_MCOUNT_RECORD select HAVE_DYNAMIC_FTRACE select HAVE_FUNCTION_TRACER select ARCH_WANT_OPTIONAL_GPIOLIB diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl index 7acbe17..48609e9 100755 --- a/scripts/recordmcount.pl +++ b/scripts/recordmcount.pl @@ -178,7 +178,12 @@ if ($arch eq "x86_64") { $section_regex = "Disassembly of section\\s+(\\S+):"; $function_regex = "^([0-9a-fA-F]+)\\s+<(\\.?.*?)>:"; $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s\\.?_mcount\$"; - $type = ".quad"; + if ($bits == 64) { + $type = ".quad"; + } else { + $type = ".long"; + } + } else { die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD"; }