aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/compiler-intel.h
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-02-21 17:07:14 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2013-02-21 17:07:14 +0100
commite29371d762df5bb35d2bc434ea266a046e5a0a75 (patch)
treedac4a8db52d92453415f35606130a49e9f32e4ef /include/linux/compiler-intel.h
parentnetfilter: ipset: Fix range bug in hash:ip,port,net (diff)
parentnetfilter: nf_ct_reasm: fix per-netns sysctl initialization (diff)
downloadlinux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.tar.xz
linux-dev-e29371d762df5bb35d2bc434ea266a046e5a0a75.zip
Merge branch 'master' of git://1984.lsi.us.es/nf
Diffstat (limited to 'include/linux/compiler-intel.h')
-rw-r--r--include/linux/compiler-intel.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/compiler-intel.h b/include/linux/compiler-intel.h
index d8e636e5607d..973ce10c40b6 100644
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
@@ -29,3 +29,10 @@
#endif
#define uninitialized_var(x) x
+
+#ifndef __HAVE_BUILTIN_BSWAP16__
+/* icc has this, but it's called _bswap16 */
+#define __HAVE_BUILTIN_BSWAP16__
+#define __builtin_bswap16 _bswap16
+#endif
+