From 08dc7717c11afdff91477dcd95fc63abc8720c9b Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Nov 2009 13:11:46 +0100
Subject: [PATCH] --- yaml --- r: 169807 b: refs/heads/master c:
 4d795fb17a02a87e35782773b88b7a63acfbeaae h: refs/heads/master i:   169805:
 a2c449dc502111050966bcf4aed507f6722fcce9   169803:
 64f63771d3d502b6fa61b037846607bcf8f5a899   169799:
 f8027639a4d92f357d8cbf0a3686d967b69a3409   169791:
 c3074e26ae2613ba5a475dbd4ee6ee42991c46af v: v3

---
 [refs]                | 2 +-
 trunk/mm/page_alloc.c | 4 +---
 trunk/mm/util.c       | 3 +++
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 7d78b819266c..171792a73ced 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba005e1f417295d28cd1563ab82bc33af07fb16a
+refs/heads/master: 4d795fb17a02a87e35782773b88b7a63acfbeaae
diff --git a/trunk/mm/page_alloc.c b/trunk/mm/page_alloc.c
index bdb22f55d006..2bc2ac63f41e 100644
--- a/trunk/mm/page_alloc.c
+++ b/trunk/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/trunk/mm/util.c b/trunk/mm/util.c
index 15d197571b4d..7c35ad95f927 100644
--- a/trunk/mm/util.c
+++ b/trunk/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