diff options
| author | Jesse Gross <jesse@nicira.com> | 2011-01-31 15:15:05 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2011-02-04 11:27:16 -0800 |
| commit | dd2525b87e716ebf06995961321869f521cab1ef (patch) | |
| tree | 011ea0df07899b7fa73f2ad4026d4f24cf680d04 /include | |
| parent | 4fadfb5644bfc91cf719a0783f17121042db0035 (diff) | |
datapath-protocol: Dropped unused __aligned_* types.
These types are no longer used, are redundantly defined, and were
cluttering our interface header.
Signed-off-by: Jesse Gross <jesse@nicira.com>
Acked-by: Ben Pfaff <blp@nicira.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/automake.mk | 3 | ||||
| -rw-r--r-- | include/linux/types.h | 13 | ||||
| -rw-r--r-- | include/openvswitch/datapath-protocol.h | 6 |
3 files changed, 1 insertions, 21 deletions
diff --git a/include/linux/automake.mk b/include/linux/automake.mk index 56103a79..a0a963d0 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 8b9227e7..00000000 --- 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 eafc8003..dbf1f5e6 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> |