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
2929
3030 #include <linux/types.h>
3131 #include <linux/fs.h>
32−#include <linux/signal.h>
3332 #include <asm/byteorder.h>
3433
3534 typedef __kernel_ulong_t aio_context_t;
@@ -110,10 +109,5 @@ struct iocb { · 74 unmodified lines
110109 #undef IFBIG
111110 #undef IFLITTLE
112111
113−struct __aio_sigset {
114− const sigset_t __user *sigmask;
115− size_t sigsetsize;
116−};
117−
118112 #endif /* __LINUX__AIO_ABI_H */
119113
include/uapi/linux/btf.h+1−1
@@ -76,7 +76,7 @@ struct btf_type { · 75 unmodified lines
7676 */
7777 #define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
7878 #define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
79−#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)
79+#define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
8080
8181 /* Attributes stored in the BTF_INT_ENCODING */
8282 #define BTF_INT_SIGNED (1 << 0)