History

Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net

David S. Miller committed 8 years ago

Commit 19725492 parents aea5f65 9981b4f124 files · +1266 −699Browse files

Showing the changes to include/uapi/linux (2 of 124 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/aio_abi.h +0 −6
  2. include/uapi/linux/btf.h +1 −1
include/uapi/linux/aio_abi.h+0−6
@@ -29,7 +29,6 @@ · 28 unmodified lines
29 29
30#include <linux/types.h>30#include <linux/types.h>
31#include <linux/fs.h>31#include <linux/fs.h>
32#include <linux/signal.h>
33#include <asm/byteorder.h>32#include <asm/byteorder.h>
34 33
35typedef __kernel_ulong_t aio_context_t;34typedef __kernel_ulong_t aio_context_t;
@@ -110,10 +109,5 @@ struct iocb { · 74 unmodified lines
110#undef IFBIG109#undef IFBIG
111#undef IFLITTLE110#undef IFLITTLE
112 111
113struct __aio_sigset {
114 const sigset_t __user *sigmask;
115 size_t sigsetsize;
116};
117
118#endif /* __LINUX__AIO_ABI_H */112#endif /* __LINUX__AIO_ABI_H */
119 113
include/uapi/linux/btf.h+1−1
@@ -76,7 +76,7 @@ struct btf_type { · 75 unmodified lines
76 */76 */
77#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)77#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
78#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)78#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
79#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)79#define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
80 80
81/* Attributes stored in the BTF_INT_ENCODING */81/* Attributes stored in the BTF_INT_ENCODING */
82#define BTF_INT_SIGNED (1 << 0)82#define BTF_INT_SIGNED (1 << 0)