diff options
author | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-05-18 22:11:32 +0200 |
commit | c6cd850d6568872f66fc4a4582f34f9b910066ca (patch) | |
tree | e9a6370f7b0ce110e2916a6288a8fb0ee8323e37 /tools | |
parent | net/mlx5e: Fix possible memory leak (diff) | |
parent | Merge tag 'md/4.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shli/md (diff) | |
download | linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.tar.xz linux-c6cd850d6568872f66fc4a4582f34f9b910066ca.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'tools')
-rw-r--r-- | tools/testing/selftests/bpf/include/uapi/linux/types.h | 16 | ||||
-rw-r--r-- | tools/testing/selftests/bpf/test_pkt_access.c | 1 |
2 files changed, 17 insertions, 0 deletions
diff --git a/tools/testing/selftests/bpf/include/uapi/linux/types.h b/tools/testing/selftests/bpf/include/uapi/linux/types.h index fbd16a7554af..51841848fbfe 100644 --- a/tools/testing/selftests/bpf/include/uapi/linux/types.h +++ b/tools/testing/selftests/bpf/include/uapi/linux/types.h @@ -3,4 +3,20 @@ #include <asm-generic/int-ll64.h> +/* copied from linux:include/uapi/linux/types.h */ +#define __bitwise +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; + +#define __aligned_u64 __u64 __attribute__((aligned(8))) +#define __aligned_be64 __be64 __attribute__((aligned(8))) +#define __aligned_le64 __le64 __attribute__((aligned(8))) + #endif /* _UAPI_LINUX_TYPES_H */ diff --git a/tools/testing/selftests/bpf/test_pkt_access.c b/tools/testing/selftests/bpf/test_pkt_access.c index 39387bb7e08c..6e11ba11709e 100644 --- a/tools/testing/selftests/bpf/test_pkt_access.c +++ b/tools/testing/selftests/bpf/test_pkt_access.c @@ -5,6 +5,7 @@ * License as published by the Free Software Foundation. */ #include <stddef.h> +#include <string.h> #include <linux/bpf.h> #include <linux/if_ether.h> #include <linux/if_packet.h> |