From: tip-bot for Ingo Molnar <mingo@elte.hu>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
penberg@cs.helsinki.fi, lizf@cn.fujitsu.com, mel@csn.ul.ie,
fweisbec@gmail.com, rostedt@goodmis.org, tglx@linutronix.de,
mingo@elte.hu
Subject: [tip:perf/core] tracing: Fix kmem event exports
Date: Thu, 26 Nov 2009 12:34:16 GMT [thread overview]
Message-ID: <tip-4d795fb17a02a87e35782773b88b7a63acfbeaae@git.kernel.org> (raw)
In-Reply-To: <4B0E286A.2000405@cn.fujitsu.com>
Commit-ID: 4d795fb17a02a87e35782773b88b7a63acfbeaae
Gitweb: http://git.kernel.org/tip/4d795fb17a02a87e35782773b88b7a63acfbeaae
Author: Ingo Molnar <mingo@elte.hu>
AuthorDate: Thu, 26 Nov 2009 13:11:46 +0100
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 26 Nov 2009 13:17:43 +0100
tracing: Fix kmem event exports
Commit 53d0422 ("tracing: Convert some kmem events to DEFINE_EVENT")
moved the kmem tracepoint creation from util.c to page_alloc.c,
but forgot to move the exports.
Move them back.
Cc: Li Zefan <lizf@cn.fujitsu.com>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mel Gorman <mel@csn.ul.ie>
LKML-Reference: <4B0E286A.2000405@cn.fujitsu.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
mm/page_alloc.c | 4 +---
mm/util.c | 3 +++
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index bdb22f5..2bc2ac6 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -48,14 +48,12 @@
#include <linux/page_cgroup.h>
#include <linux/debugobjects.h>
#include <linux/kmemleak.h>
+#include <trace/events/kmem.h>
#include <asm/tlbflush.h>
#include <asm/div64.h>
#include "internal.h"
-#define CREATE_TRACE_POINTS
-#include <trace/events/kmem.h>
-
/*
* Array of node states.
*/
diff --git a/mm/util.c b/mm/util.c
index 15d1975..7c35ad9 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -6,6 +6,9 @@
#include <linux/sched.h>
#include <asm/uaccess.h>
+#define CREATE_TRACE_POINTS
+#include <trace/events/kmem.h>
+
/**
* kstrdup - allocate space for and copy an existing string
* @s: the string to duplicate
next prev parent reply other threads:[~2009-11-26 12:35 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-26 7:02 [PATCH 0/9] tracing: Convert some trace events to DEFINE_TRACE Li Zefan
2009-11-26 7:03 ` [PATCH 1/9] tracing: Convert module refcnt events to DEFINE_EVENT Li Zefan
2009-11-26 8:42 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:04 ` [PATCH 2/9] tracing: Convert some kmem " Li Zefan
2009-11-26 7:24 ` Pekka Enberg
2009-11-26 7:38 ` Steven Rostedt
2009-11-26 7:57 ` Ingo Molnar
2009-11-26 8:29 ` Steven Rostedt
2009-11-26 8:16 ` [tip:perf/core] events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS() tip-bot for Ingo Molnar
2009-11-26 8:33 ` Steven Rostedt
2009-11-26 8:40 ` Ingo Molnar
2009-11-26 14:45 ` Steven Rostedt
2009-11-26 17:55 ` Frederic Weisbecker
2009-11-26 18:12 ` Ingo Molnar
2009-11-26 19:12 ` Steven Rostedt
2009-11-26 19:20 ` Ingo Molnar
2009-11-26 19:44 ` Steven Rostedt
2009-11-26 19:47 ` Steven Rostedt
2009-11-26 23:13 ` Frederic Weisbecker
2009-11-27 3:52 ` Steven Rostedt
2009-11-26 8:42 ` [tip:perf/core] tracing: Convert some kmem events to DEFINE_EVENT tip-bot for Li Zefan
2009-11-26 12:34 ` tip-bot for Ingo Molnar [this message]
2009-11-26 7:04 ` [PATCH 3/9] tracing: Convert softirq " Li Zefan
2009-11-26 8:43 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:05 ` [PATCH 4/9] tracing: Convert some workqueue " Li Zefan
2009-11-26 8:43 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:05 ` [PATCH 5/9] tracing: Convert some power " Li Zefan
2009-11-26 8:43 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:06 ` [PATCH 6/9] tracing: Convert some block " Li Zefan
2009-11-26 8:36 ` Jens Axboe
2009-11-26 8:44 ` Ingo Molnar
2009-11-26 8:47 ` Jens Axboe
2009-11-26 8:50 ` Ingo Molnar
2009-11-26 8:52 ` Jens Axboe
2009-11-26 8:43 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:06 ` [PATCH 7/9] tracing: Convert some jbd2 " Li Zefan
2009-11-26 8:44 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:07 ` [PATCH 8/9] tracing: Convert some ext4 events to DEFINE_TRACE Li Zefan
2009-11-26 8:44 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:08 ` [PATCH 9/9] tracing: Restore original format of sched events Li Zefan
2009-11-26 8:44 ` [tip:perf/core] " tip-bot for Li Zefan
2009-11-26 7:32 ` [PATCH 0/9] tracing: Convert some trace events to DEFINE_TRACE Steven Rostedt
2009-11-26 7:59 ` Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-4d795fb17a02a87e35782773b88b7a63acfbeaae@git.kernel.org \
--to=mingo@elte.hu \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mel@csn.ul.ie \
--cc=mingo@redhat.com \
--cc=penberg@cs.helsinki.fi \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox