kybaaz/linux-xiaomi-chiron
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David S. Miller 2018-07-24 19:21:58 -07:00
commit 19725496da
124 changed files with 1267 additions and 700 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/uapi/linux/aio_abi.h
View file

@ -29,7 +29,6 @@
#include <linux/types.h>
#include <linux/fs.h>
#include <linux/signal.h>
#include <asm/byteorder.h>
typedef __kernel_ulong_t aio_context_t;
@ -110,10 +109,5 @@ struct iocb {
#undef IFBIG
#undef IFLITTLE
struct __aio_sigset {
const sigset_t __user *sigmask;
size_t sigsetsize;
};
#endif /* __LINUX__AIO_ABI_H */

2
include/uapi/linux/btf.h
View file

@ -76,7 +76,7 @@ struct btf_type {
*/
#define BTF_INT_ENCODING(VAL) (((VAL) & 0x0f000000) >> 24)
#define BTF_INT_OFFSET(VAL) (((VAL & 0x00ff0000)) >> 16)
#define BTF_INT_BITS(VAL) ((VAL) & 0x0000ffff)
#define BTF_INT_BITS(VAL) ((VAL) & 0x000000ff)
/* Attributes stored in the BTF_INT_ENCODING */
#define BTF_INT_SIGNED (1 << 0)