[ovs-dev] [PATCH 1/2] datapath: Compatibility code for __packed macro.

Jesse Gross jesse at nicira.com
Sun Dec 12 20:49:39 UTC 2010


The __packed macro for structure packing wasn't introduced until 2.6.24,
so define it ourselves.

Signed-off-by: Jesse Gross <jesse at nicira.com>
---
 datapath/linux-2.6/Modules.mk                      |    1 +
 .../compat-2.6/include/linux/compiler-gcc.h        |    9 +++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
 create mode 100644 datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h

diff --git a/datapath/linux-2.6/Modules.mk b/datapath/linux-2.6/Modules.mk
index e1e3334..29379a4 100644
--- a/datapath/linux-2.6/Modules.mk
+++ b/datapath/linux-2.6/Modules.mk
@@ -11,6 +11,7 @@ openvswitch_headers += \
 	linux-2.6/compat-2.6/compat26.h \
 	linux-2.6/compat-2.6/include/asm-generic/bug.h \
 	linux-2.6/compat-2.6/include/linux/bottom_half.h \
+	linux-2.6/compat-2.6/include/linux/compiler-gcc.h \
 	linux-2.6/compat-2.6/include/linux/cpumask.h \
 	linux-2.6/compat-2.6/include/linux/dmi.h \
 	linux-2.6/compat-2.6/include/linux/err.h \
diff --git a/datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h b/datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h
new file mode 100644
index 0000000..1ee8d6f
--- /dev/null
+++ b/datapath/linux-2.6/compat-2.6/include/linux/compiler-gcc.h
@@ -0,0 +1,9 @@
+#ifndef __LINUX_COMPILER_H
+#error "Please don't include <linux/compiler-gcc.h> directly, include <linux/compiler.h> instead."
+#endif
+
+#include_next <linux/compiler-gcc.h>
+
+#ifndef __packed
+#define __packed __attribute__((packed))
+#endif
-- 
1.7.1





More information about the dev mailing list