diff options
author | Elliott Hughes <enh@google.com> | 2014-02-08 01:04:42 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-02-08 01:04:43 +0000 |
commit | e120c4bf77ddd60b94cecbe480158bf676a3d64f (patch) | |
tree | d4119e22901583052f0208ad8d1435798e3b2edb | |
parent | 989ad86a78906e192add5955590d69d24a39fcf3 (diff) | |
parent | 955c9d3f76d0e40573e13ee6cb17611a14a2d74f (diff) | |
download | iproute2-idea133-weekly-release.tar.gz |
Merge "Post-uapi cleanup."idea133-weekly-release
-rw-r--r-- | include/linux/socket.h | 24 | ||||
-rw-r--r-- | include/linux/types.h | 54 |
2 files changed, 0 insertions, 78 deletions
diff --git a/include/linux/socket.h b/include/linux/socket.h deleted file mode 100644 index 5428de4d..00000000 --- a/include/linux/socket.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef _LINUX_SOCKET_H -#define _LINUX_SOCKET_H - -/* TODO: remove this file and use our uapi headers instead. */ -typedef unsigned short __kernel_sa_family_t; - -/* - * Desired design of maximum size and alignment (see RFC2553) - */ -#define _K_SS_MAXSIZE 128 /* Implementation specific max size */ -#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *)) - /* Implementation specific desired alignment */ - -typedef unsigned short __kernel_sa_family_t; - -struct __kernel_sockaddr_storage { - __kernel_sa_family_t ss_family; /* address family */ - /* Following field(s) are implementation specific */ - char __data[_K_SS_MAXSIZE - sizeof(unsigned short)]; - /* space to achieve desired size, */ - /* _SS_MAXSIZE value minus size of ss_family */ -} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */ - -#endif /* _LINUX_SOCKET_H */ diff --git a/include/linux/types.h b/include/linux/types.h deleted file mode 100644 index f7aa52fa..00000000 --- a/include/linux/types.h +++ /dev/null @@ -1,54 +0,0 @@ -#ifndef _LINUX_TYPES_H -#define _LINUX_TYPES_H - -/* TODO: remove this file and use our uapi headers instead. */ -#define __aligned_u64 __u64 __attribute__((aligned(8))) - -#include <asm/types.h> - -#ifndef __ASSEMBLY__ - -#include <linux/posix_types.h> - - -/* - * Below are truly Linux-specific types that should never collide with - * any application/library that wants linux/types.h. - */ - -#ifdef __CHECKER__ -#define __bitwise__ __attribute__((bitwise)) -#else -#define __bitwise__ -#endif -#ifdef __CHECK_ENDIAN__ -#define __bitwise __bitwise__ -#else -#define __bitwise -#endif - -typedef __u16 __bitwise __le16; -typedef __u16 __bitwise __be16; -typedef __u32 __bitwise __le32; -typedef __u32 __bitwise __be32; -typedef __u64 __bitwise __le64; -typedef __u64 __bitwise __be64; - -typedef __u16 __bitwise __sum16; -typedef __u32 __bitwise __wsum; - -/* - * aligned_u64 should be used in defining kernel<->userspace ABIs to avoid - * common 32/64-bit compat problems. - * 64-bit values align to 4-byte boundaries on x86_32 (and possibly other - * architectures) and to 8-byte boundaries on 64-bit architectures. The new - * aligned_64 type enforces 8-byte alignment so that structs containing - * aligned_64 values have the same alignment on 32-bit and 64-bit architectures. - * No conversions are necessary between 32-bit user-space and a 64-bit kernel. - */ -#define __aligned_u64 __u64 __attribute__((aligned(8))) -#define __aligned_be64 __be64 __attribute__((aligned(8))) -#define __aligned_le64 __le64 __attribute__((aligned(8))) - -#endif /* __ASSEMBLY__ */ -#endif /* _LINUX_TYPES_H */ |