Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932203AbZJCNrs (ORCPT ); Sat, 3 Oct 2009 09:47:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932176AbZJCNrl (ORCPT ); Sat, 3 Oct 2009 09:47:41 -0400 Received: from mail-ew0-f211.google.com ([209.85.219.211]:35853 "EHLO mail-ew0-f211.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932124AbZJCNrb (ORCPT ); Sat, 3 Oct 2009 09:47:31 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=saN5bLNm33iJA6R2gHuVUH0mWglyOPyZ+gfn4sUML01gYmU87ph8ex8gzMgIXANQb1 crWITSegnKXESX4CD+uMRKG46UQvA0xXyKfBAvlJLnKbEFox8BfTGXb3XGCJceAxhbFv EcseUW4fgNJeM40vem0yZtTiY1mWTN6T2lGGc= From: Frederic Weisbecker To: Ingo Molnar Cc: LKML , Frederic Weisbecker , Paul Mackerras , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Li Zefan Subject: [PATCH 2/2] tracing: Use free_percpu instead of kfree Date: Sat, 3 Oct 2009 15:47:30 +0200 Message-Id: <1254577650-5623-3-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.6.2.3 In-Reply-To: <19140.13582.223629.56214@cargo.ozlabs.ibm.com> References: <19140.13582.223629.56214@cargo.ozlabs.ibm.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1395 Lines: 38 In the event->profile_enable() failure path, we release the per cpu buffers using kfree which is wrong because they are per cpu pointers. Although free_percpu only wraps kfree for now, that may change in the future so lets use the correct way. Reported-by: Paul Mackerras Signed-off-by: Frederic Weisbecker Cc: Steven Rostedt Cc: Ingo Molnar Cc: Peter Zijlstra Cc: Li Zefan --- kernel/trace/trace_event_profile.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_event_profile.c b/kernel/trace/trace_event_profile.c index e52784b..8d5c171 100644 --- a/kernel/trace/trace_event_profile.c +++ b/kernel/trace/trace_event_profile.c @@ -53,8 +53,8 @@ static int ftrace_profile_enable_event(struct ftrace_event_call *event) fail_buf_nmi: if (!total_profile_count) { - kfree(trace_profile_buf_nmi); - kfree(trace_profile_buf); + free_percpu(trace_profile_buf_nmi); + free_percpu(trace_profile_buf); trace_profile_buf_nmi = NULL; trace_profile_buf = NULL; } -- 1.6.2.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/