From 9ac84f4c83ab0aecbbe5507d99499b5180f8308e Mon Sep 17 00:00:00 2001
From: Arnaud Lacombe <lacombar@gmail.com>
Date: Mon, 25 Jul 2011 17:13:03 -0700
Subject: [PATCH] --- yaml --- r: 259000 b: refs/heads/master c:
 b9d4f426689765d1e066913f6872c8d59e0f2ac9 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/kernel.h | 43 ++++++++++++++++++------------------
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/[refs] b/[refs]
index 42888eb403c5..58b271efba20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d00f92f437f0ff682876cab9f2d94cf3b6e5d17
+refs/heads/master: b9d4f426689765d1e066913f6872c8d59e0f2ac9
diff --git a/trunk/include/linux/kernel.h b/trunk/include/linux/kernel.h
index bf66f068368b..9a43ad792cfc 100644
--- a/trunk/include/linux/kernel.h
+++ b/trunk/include/linux/kernel.h
@@ -691,6 +691,27 @@ extern int __build_bug_on_failed;
 #endif
 #endif	/* __CHECKER__ */
 
+/* Trap pasters of __FUNCTION__ at compile-time */
+#define __FUNCTION__ (__func__)
+
+/* This helps us to avoid #ifdef CONFIG_NUMA */
+#ifdef CONFIG_NUMA
+#define NUMA_BUILD 1
+#else
+#define NUMA_BUILD 0
+#endif
+
+/* This helps us avoid #ifdef CONFIG_COMPACTION */
+#ifdef CONFIG_COMPACTION
+#define COMPACTION_BUILD 1
+#else
+#define COMPACTION_BUILD 0
+#endif
+
+/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
+#ifdef CONFIG_FTRACE_MCOUNT_RECORD
+# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
+#endif
 
 struct sysinfo;
 extern int do_sysinfo(struct sysinfo *info);
@@ -715,26 +736,4 @@ struct sysinfo {
 	char _f[20-2*sizeof(long)-sizeof(int)];	/* Padding: libc5 uses this.. */
 };
 
-/* Trap pasters of __FUNCTION__ at compile-time */
-#define __FUNCTION__ (__func__)
-
-/* This helps us to avoid #ifdef CONFIG_NUMA */
-#ifdef CONFIG_NUMA
-#define NUMA_BUILD 1
-#else
-#define NUMA_BUILD 0
-#endif
-
-/* This helps us avoid #ifdef CONFIG_COMPACTION */
-#ifdef CONFIG_COMPACTION
-#define COMPACTION_BUILD 1
-#else
-#define COMPACTION_BUILD 0
-#endif
-
-/* Rebuild everything on CONFIG_FTRACE_MCOUNT_RECORD */
-#ifdef CONFIG_FTRACE_MCOUNT_RECORD
-# define REBUILD_DUE_TO_FTRACE_MCOUNT_RECORD
-#endif
-
 #endif