From 5a577f10e51d8cce71c55786df7dd7a3948e86c0 Mon Sep 17 00:00:00 2001
From: David Woodhouse <dwmw2@infradead.org>
Date: Thu, 4 May 2006 00:41:02 +0100
Subject: [PATCH] --- yaml --- r: 27989 b: refs/heads/master c:
 423bc7b22bdeb73efeabfcf91d8a459ac33088f1 h: refs/heads/master i:   27987:
 687c1246851f3b2749c1713e011cceabeb4740bc v: v3

---
 [refs]                         |  2 +-
 trunk/include/linux/compiler.h | 19 ++++++++++---------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8f9fe2e4cbee..589fb65ebe58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4f79c3ffc6e04623711e86cf9a0e09e4aad8cb36
+refs/heads/master: 423bc7b22bdeb73efeabfcf91d8a459ac33088f1
diff --git a/trunk/include/linux/compiler.h b/trunk/include/linux/compiler.h
index 1234be9024a2..9b4f11094937 100644
--- a/trunk/include/linux/compiler.h
+++ b/trunk/include/linux/compiler.h
@@ -128,6 +128,16 @@ extern void __chk_io_ptr(void __iomem *);
 # define __attribute_pure__	/* unimplemented */
 #endif
 
+#ifndef noinline
+#define noinline
+#endif
+
+#ifndef __always_inline
+#define __always_inline inline
+#endif
+
+#endif /* __KERNEL__ */
+
 /*
  * From the GCC manual:
  *
@@ -146,13 +156,4 @@ extern void __chk_io_ptr(void __iomem *);
 # define __attribute_const__	/* unimplemented */
 #endif
 
-#ifndef noinline
-#define noinline
-#endif
-
-#ifndef __always_inline
-#define __always_inline inline
-#endif
-
-#endif /* __KERNEL__ */
 #endif /* __LINUX_COMPILER_H */