summaryrefslogtreecommitdiff
path: root/linux/dev/include
diff options
context:
space:
mode:
authorGuillem Jover <guillem@hadrons.org>2011-08-30 03:09:37 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2011-08-31 00:37:02 +0200
commit39121f37ee129391fe17394ffdbf894c37f2c729 (patch)
tree54642a19da35b567a77d7a9636e6d9972c08b227 /linux/dev/include
parentb266a845c84625535d082f79c5685cb37e28b2ee (diff)
Import Linux 3.1 compiler definitions
* linux/src/include/linux/compiler.h: New file. * linux/src/include/linux/compiler-gcc.h: Likewise. * linux/src/include/linux/compiler-gcc3.h: Likewise. * linux/src/include/linux/compiler-gcc4.h: Likewise. * linux/dev/include/linux/kernel.h (barrier): Remove definition and include <linux/compiler.h> instead.
Diffstat (limited to 'linux/dev/include')
-rw-r--r--linux/dev/include/linux/kernel.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/dev/include/linux/kernel.h b/linux/dev/include/linux/kernel.h
index aef73ac..4db76ac 100644
--- a/linux/dev/include/linux/kernel.h
+++ b/linux/dev/include/linux/kernel.h
@@ -9,9 +9,7 @@
#include <stdarg.h>
#include <linux/linkage.h>
-
-/* Optimization barrier */
-#define barrier() __asm__("": : :"memory")
+#include <linux/compiler.h>
#define INT_MAX ((int)(~0U>>1))
#define UINT_MAX (~0U)