[ovs-dev] [PATCH 1/2] datapath-protocol: Dropped unused __aligned_* types.

Jesse Gross jesse at nicira.com
Fri Feb 4 02:25:54 UTC 2011


These types are no longer used, are redundantly defined, and were
cluttering our interface header.

Signed-off-by: Jesse Gross <jesse at nicira.com>
---
 include/linux/automake.mk               |    3 +--
 include/linux/types.h                   |   13 -------------
 include/openvswitch/datapath-protocol.h |    6 ------
 3 files changed, 1 insertions(+), 21 deletions(-)
 delete mode 100644 include/linux/types.h

diff --git a/include/linux/automake.mk b/include/linux/automake.mk
index 56103a7..a0a963d 100644
--- a/include/linux/automake.mk
+++ b/include/linux/automake.mk
@@ -1,3 +1,2 @@
 noinst_HEADERS += \
-	include/linux/if_link.h \
-	include/linux/types.h
+	include/linux/if_link.h
diff --git a/include/linux/types.h b/include/linux/types.h
deleted file mode 100644
index 8b9227e..0000000
--- a/include/linux/types.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_TYPES_USER_WRAPPER_H
-#define __LINUX_TYPES_USER_WRAPPER_H 1
-
-#include_next <linux/types.h>
-
-/* These were only introduced in v2.6.36. */
-#ifndef __aligned_u64
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif
-
-#endif
diff --git a/include/openvswitch/datapath-protocol.h b/include/openvswitch/datapath-protocol.h
index 8645096..b19d04b 100644
--- a/include/openvswitch/datapath-protocol.h
+++ b/include/openvswitch/datapath-protocol.h
@@ -61,12 +61,6 @@
 #include <sys/socket.h>
 #endif
 
-#ifndef __aligned_u64
-#define __aligned_u64 __u64 __attribute__((aligned(8)))
-#define __aligned_be64 __be64 __attribute__((aligned(8)))
-#define __aligned_le64 __le64 __attribute__((aligned(8)))
-#endif
-
 #include <linux/if_link.h>
 #include <linux/netlink.h>
 
-- 
1.7.1





More information about the dev mailing list