aboutsummaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2021-02-07 17:45:24 +0100
committerDmitry Vyukov <dvyukov@google.com>2021-02-12 18:09:14 +0100
commit3e128fa282b441c9f114f9708c1fd232d7869965 (patch)
tree2cb1d4b914038d15f14b9096215134d6e393b994 /sys
parenta5f86b15f4f60350198e4b98fb7451d45d38a186 (diff)
sys/linux: update consts
Update consts on upstream 825b5991a46ef28a05a4646c8fe1ae5cef7c7828.
Diffstat (limited to 'sys')
-rw-r--r--sys/linux/fs_fuse.txt.const2
-rw-r--r--sys/linux/fs_ioctl_f2fs.txt1
-rw-r--r--sys/linux/io_uring.txt.const2
-rw-r--r--sys/linux/socket_netlink_netfilter_ipset.txt2
-rw-r--r--sys/linux/socket_netlink_netfilter_ipset.txt.const2
-rw-r--r--sys/syz-extract/extract.go3
6 files changed, 8 insertions, 4 deletions
diff --git a/sys/linux/fs_fuse.txt.const b/sys/linux/fs_fuse.txt.const
index bfdb9a549..c0a45c1c6 100644
--- a/sys/linux/fs_fuse.txt.const
+++ b/sys/linux/fs_fuse.txt.const
@@ -23,7 +23,7 @@ FUSE_FLOCK_LOCKS = 1024
FUSE_HANDLE_KILLPRIV = 524288
FUSE_HAS_IOCTL_DIR = 2048
FUSE_IOCTL_RETRY = 4
-FUSE_KERNEL_MINOR_VERSION = 32
+FUSE_KERNEL_MINOR_VERSION = 33
FUSE_KERNEL_VERSION = 7
FUSE_MAX_PAGES = 4194304
FUSE_MIN_READ_BUFFER = 8192
diff --git a/sys/linux/fs_ioctl_f2fs.txt b/sys/linux/fs_ioctl_f2fs.txt
index ae9d3d7fe..844a4c8de 100644
--- a/sys/linux/fs_ioctl_f2fs.txt
+++ b/sys/linux/fs_ioctl_f2fs.txt
@@ -4,6 +4,7 @@
include <uapi/linux/fs.h>
include <linux/f2fs_fs.h>
include <fs/f2fs/f2fs.h>
+include <uapi/linux/f2fs.h>
ioctl$F2FS_IOC_START_ATOMIC_WRITE(fd fd, cmd const[F2FS_IOC_START_ATOMIC_WRITE], arg const[0])
ioctl$F2FS_IOC_COMMIT_ATOMIC_WRITE(fd fd, cmd const[F2FS_IOC_COMMIT_ATOMIC_WRITE], arg const[0])
diff --git a/sys/linux/io_uring.txt.const b/sys/linux/io_uring.txt.const
index 82f221d13..4f7c82c1f 100644
--- a/sys/linux/io_uring.txt.const
+++ b/sys/linux/io_uring.txt.const
@@ -26,7 +26,7 @@ IORING_OP_FADVISE = 24
IORING_OP_FALLOCATE = 17
IORING_OP_FILES_UPDATE = 20
IORING_OP_FSYNC = 3
-IORING_OP_LAST = 34
+IORING_OP_LAST = 37
IORING_OP_LINK_TIMEOUT = 15
IORING_OP_MADVISE = 25
IORING_OP_NOP = 0
diff --git a/sys/linux/socket_netlink_netfilter_ipset.txt b/sys/linux/socket_netlink_netfilter_ipset.txt
index 5d3f4c631..6d075e91b 100644
--- a/sys/linux/socket_netlink_netfilter_ipset.txt
+++ b/sys/linux/socket_netlink_netfilter_ipset.txt
@@ -124,7 +124,7 @@ ip_set_type_create_policy [
IPSET_ATTR_HASHSIZE nlnetw[IPSET_ATTR_HASHSIZE, int32be]
IPSET_ATTR_MAXELEM nlnetw[IPSET_ATTR_MAXELEM, int32be]
IPSET_ATTR_NETMASK nlattr[IPSET_ATTR_NETMASK, int8]
- IPSET_ATTR_PROBES nlattr[IPSET_ATTR_PROBES, int8]
+ IPSET_ATTR_BUCKETSIZE nlattr[IPSET_ATTR_BUCKETSIZE, int8]
IPSET_ATTR_SIZE nlnetw[IPSET_ATTR_SIZE, int32be]
] [varlen]
diff --git a/sys/linux/socket_netlink_netfilter_ipset.txt.const b/sys/linux/socket_netlink_netfilter_ipset.txt.const
index 30ecd9fba..42d740a7a 100644
--- a/sys/linux/socket_netlink_netfilter_ipset.txt.const
+++ b/sys/linux/socket_netlink_netfilter_ipset.txt.const
@@ -1,6 +1,7 @@
# Code generated by syz-sysgen. DO NOT EDIT.
arches = 386, amd64, arm, arm64, mips64le, ppc64le, riscv64, s390x
IPSET_ATTR_ADT = 8
+IPSET_ATTR_BUCKETSIZE = 21
IPSET_ATTR_BYTES = 24
IPSET_ATTR_CADT_FLAGS = 8
IPSET_ATTR_CIDR = 3
@@ -29,7 +30,6 @@ IPSET_ATTR_NETMASK = 20
IPSET_ATTR_PACKETS = 25
IPSET_ATTR_PORT = 4
IPSET_ATTR_PORT_TO = 5
-IPSET_ATTR_PROBES = 21
IPSET_ATTR_PROTO = 7
IPSET_ATTR_PROTOCOL = 1
IPSET_ATTR_REVISION = 4
diff --git a/sys/syz-extract/extract.go b/sys/syz-extract/extract.go
index d9ba12b40..255c0e60b 100644
--- a/sys/syz-extract/extract.go
+++ b/sys/syz-extract/extract.go
@@ -267,6 +267,9 @@ func archFileList(os, arch string, files []string) (string, []string, []string,
// Not upstream, generated on:
// https://chromium.googlesource.com/chromiumos/third_party/kernel d2a8a1eb8b86
"dev_bifrost.txt": true,
+ // ION support was removed from kernel.
+ // We plan to leave the descriptions for some time as is and later remove them.
+ "dev_ion.txt": true,
}
androidFiles := map[string]bool{
"dev_tlk_device.txt": true,