Revert "Update to v6.11 kernel headers."
Revert submission 3277111-kernel_611
Reason for revert: Droidmonitor created revert due to b/369448759.
Reverted changes: /q/submissionid:3277111-kernel_611
Change-Id: I3cabcc2c55904459c69dbfa81e6e65863a7e57cc
diff --git a/libc/kernel/uapi/linux/bpf.h b/libc/kernel/uapi/linux/bpf.h
index 8d64816..c732920 100644
--- a/libc/kernel/uapi/linux/bpf.h
+++ b/libc/kernel/uapi/linux/bpf.h
@@ -367,7 +367,6 @@
#define BPF_F_QUERY_EFFECTIVE (1U << 0)
#define BPF_F_TEST_RUN_ON_CPU (1U << 0)
#define BPF_F_TEST_XDP_LIVE_FRAMES (1U << 1)
-#define BPF_F_TEST_SKB_CHECKSUM_COMPLETE (1U << 2)
enum bpf_stats_type {
BPF_STATS_RUN_TIME = 0,
};
@@ -774,11 +773,8 @@
#define __bpf_md_ptr(type,name) union { type name; __u64 : 64; \
} __attribute__((aligned(8)))
enum {
- BPF_SKB_TSTAMP_UNSPEC = 0,
- BPF_SKB_TSTAMP_DELIVERY_MONO = 1,
- BPF_SKB_CLOCK_REALTIME = 0,
- BPF_SKB_CLOCK_MONOTONIC = 1,
- BPF_SKB_CLOCK_TAI = 2,
+ BPF_SKB_TSTAMP_UNSPEC,
+ BPF_SKB_TSTAMP_DELIVERY_MONO,
};
struct __sk_buff {
__u32 len;
diff --git a/libc/kernel/uapi/linux/btrfs_tree.h b/libc/kernel/uapi/linux/btrfs_tree.h
index 88f44d9..ea33eee 100644
--- a/libc/kernel/uapi/linux/btrfs_tree.h
+++ b/libc/kernel/uapi/linux/btrfs_tree.h
@@ -279,8 +279,18 @@
__le64 devid;
__le64 physical;
} __attribute__((__packed__));
+#define BTRFS_STRIPE_RAID0 1
+#define BTRFS_STRIPE_RAID1 2
+#define BTRFS_STRIPE_DUP 3
+#define BTRFS_STRIPE_RAID10 4
+#define BTRFS_STRIPE_RAID5 5
+#define BTRFS_STRIPE_RAID6 6
+#define BTRFS_STRIPE_RAID1C3 7
+#define BTRFS_STRIPE_RAID1C4 8
struct btrfs_stripe_extent {
- __DECLARE_FLEX_ARRAY(struct btrfs_raid_stride, strides);
+ __u8 encoding;
+ __u8 reserved[7];
+ struct btrfs_raid_stride strides[];
} __attribute__((__packed__));
#define BTRFS_HEADER_FLAG_WRITTEN (1ULL << 0)
#define BTRFS_HEADER_FLAG_RELOC (1ULL << 1)
@@ -290,9 +300,6 @@
#define BTRFS_SUPER_FLAG_METADUMP_V2 (1ULL << 34)
#define BTRFS_SUPER_FLAG_CHANGING_FSID (1ULL << 35)
#define BTRFS_SUPER_FLAG_CHANGING_FSID_V2 (1ULL << 36)
-#define BTRFS_SUPER_FLAG_CHANGING_BG_TREE (1ULL << 38)
-#define BTRFS_SUPER_FLAG_CHANGING_DATA_CSUM (1ULL << 39)
-#define BTRFS_SUPER_FLAG_CHANGING_META_CSUM (1ULL << 40)
struct btrfs_extent_item {
__le64 refs;
__le64 generation;
diff --git a/libc/kernel/uapi/linux/dlm.h b/libc/kernel/uapi/linux/dlm.h
index 1344f9b..3c73908 100644
--- a/libc/kernel/uapi/linux/dlm.h
+++ b/libc/kernel/uapi/linux/dlm.h
@@ -20,5 +20,4 @@
};
#define DLM_LSFL_TIMEWARN 0x00000002
#define DLM_LSFL_NEWEXCL 0x00000008
-#define __DLM_LSFL_RESERVED0 0x00000010
#endif
diff --git a/libc/kernel/uapi/linux/dma-heap.h b/libc/kernel/uapi/linux/dma-heap.h
index ac86b59..467e336 100644
--- a/libc/kernel/uapi/linux/dma-heap.h
+++ b/libc/kernel/uapi/linux/dma-heap.h
@@ -9,7 +9,7 @@
#include <linux/ioctl.h>
#include <linux/types.h>
#define DMA_HEAP_VALID_FD_FLAGS (O_CLOEXEC | O_ACCMODE)
-#define DMA_HEAP_VALID_HEAP_FLAGS (0ULL)
+#define DMA_HEAP_VALID_HEAP_FLAGS (0)
struct dma_heap_allocation_data {
__u64 len;
__u32 fd;
diff --git a/libc/kernel/uapi/linux/ethtool.h b/libc/kernel/uapi/linux/ethtool.h
index e213ba1..334c788 100644
--- a/libc/kernel/uapi/linux/ethtool.h
+++ b/libc/kernel/uapi/linux/ethtool.h
@@ -270,56 +270,6 @@
ETHTOOL_MODULE_POWER_MODE_LOW = 1,
ETHTOOL_MODULE_POWER_MODE_HIGH,
};
-enum ethtool_c33_pse_ext_state {
- ETHTOOL_C33_PSE_EXT_STATE_ERROR_CONDITION = 1,
- ETHTOOL_C33_PSE_EXT_STATE_MR_MPS_VALID,
- ETHTOOL_C33_PSE_EXT_STATE_MR_PSE_ENABLE,
- ETHTOOL_C33_PSE_EXT_STATE_OPTION_DETECT_TED,
- ETHTOOL_C33_PSE_EXT_STATE_OPTION_VPORT_LIM,
- ETHTOOL_C33_PSE_EXT_STATE_OVLD_DETECTED,
- ETHTOOL_C33_PSE_EXT_STATE_PD_DLL_POWER_TYPE,
- ETHTOOL_C33_PSE_EXT_STATE_POWER_NOT_AVAILABLE,
- ETHTOOL_C33_PSE_EXT_STATE_SHORT_DETECTED,
-};
-enum ethtool_c33_pse_ext_substate_mr_mps_valid {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_DETECTED_UNDERLOAD = 1,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_MPS_VALID_CONNECTION_OPEN,
-};
-enum ethtool_c33_pse_ext_substate_error_condition {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_NON_EXISTING_PORT = 1,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNDEFINED_PORT,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_INTERNAL_HW_FAULT,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_COMM_ERROR_AFTER_FORCE_ON,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_UNKNOWN_PORT_STATUS,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_TURN_OFF,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_HOST_CRASH_FORCE_SHUTDOWN,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_CONFIG_CHANGE,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_ERROR_CONDITION_DETECTED_OVER_TEMP,
-};
-enum ethtool_c33_pse_ext_substate_mr_pse_enable {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_MR_PSE_ENABLE_DISABLE_PIN_ACTIVE = 1,
-};
-enum ethtool_c33_pse_ext_substate_option_detect_ted {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_DET_IN_PROCESS = 1,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_DETECT_TED_CONNECTION_CHECK_ERROR,
-};
-enum ethtool_c33_pse_ext_substate_option_vport_lim {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_HIGH_VOLTAGE = 1,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_LOW_VOLTAGE,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OPTION_VPORT_LIM_VOLTAGE_INJECTION,
-};
-enum ethtool_c33_pse_ext_substate_ovld_detected {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_OVLD_DETECTED_OVERLOAD = 1,
-};
-enum ethtool_c33_pse_ext_substate_power_not_available {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_BUDGET_EXCEEDED = 1,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PORT_PW_LIMIT_EXCEEDS_CONTROLLER_BUDGET,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_PD_REQUEST_EXCEEDS_PORT_LIMIT,
- ETHTOOL_C33_PSE_EXT_SUBSTATE_POWER_NOT_AVAILABLE_HW_PW_LIMIT,
-};
-enum ethtool_c33_pse_ext_substate_short_detected {
- ETHTOOL_C33_PSE_EXT_SUBSTATE_SHORT_DETECTED_SHORT_CONDITION = 1,
-};
enum ethtool_pse_types {
ETHTOOL_PSE_UNKNOWN = 1 << 0,
ETHTOOL_PSE_PODL = 1 << 1,
@@ -361,12 +311,6 @@
ETHTOOL_MM_VERIFY_STATUS_FAILED,
ETHTOOL_MM_VERIFY_STATUS_DISABLED,
};
-enum ethtool_module_fw_flash_status {
- ETHTOOL_MODULE_FW_FLASH_STATUS_STARTED = 1,
- ETHTOOL_MODULE_FW_FLASH_STATUS_IN_PROGRESS,
- ETHTOOL_MODULE_FW_FLASH_STATUS_COMPLETED,
- ETHTOOL_MODULE_FW_FLASH_STATUS_ERROR,
-};
struct ethtool_gstrings {
__u32 cmd;
__u32 string_set;
@@ -805,7 +749,6 @@
ETHTOOL_LINK_MODE_10baseT1S_Full_BIT = 99,
ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100,
ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101,
- ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT = 102,
__ETHTOOL_LINK_MODE_MASK_NBITS
};
#define __ETHTOOL_LINK_MODE_LEGACY_MASK(base_name) (1UL << (ETHTOOL_LINK_MODE_ ##base_name ##_BIT))
diff --git a/libc/kernel/uapi/linux/ethtool_netlink.h b/libc/kernel/uapi/linux/ethtool_netlink.h
index ac6391a..6757ef5 100644
--- a/libc/kernel/uapi/linux/ethtool_netlink.h
+++ b/libc/kernel/uapi/linux/ethtool_netlink.h
@@ -52,7 +52,6 @@
ETHTOOL_MSG_PLCA_GET_STATUS,
ETHTOOL_MSG_MM_GET,
ETHTOOL_MSG_MM_SET,
- ETHTOOL_MSG_MODULE_FW_FLASH_ACT,
__ETHTOOL_MSG_USER_CNT,
ETHTOOL_MSG_USER_MAX = __ETHTOOL_MSG_USER_CNT - 1
};
@@ -101,7 +100,6 @@
ETHTOOL_MSG_PLCA_NTF,
ETHTOOL_MSG_MM_GET_REPLY,
ETHTOOL_MSG_MM_NTF,
- ETHTOOL_MSG_MODULE_FW_FLASH_NTF,
__ETHTOOL_MSG_KERNEL_CNT,
ETHTOOL_MSG_KERNEL_MAX = __ETHTOOL_MSG_KERNEL_CNT - 1
};
@@ -318,26 +316,10 @@
ETHTOOL_A_COALESCE_TX_AGGR_MAX_BYTES,
ETHTOOL_A_COALESCE_TX_AGGR_MAX_FRAMES,
ETHTOOL_A_COALESCE_TX_AGGR_TIME_USECS,
- ETHTOOL_A_COALESCE_RX_PROFILE,
- ETHTOOL_A_COALESCE_TX_PROFILE,
__ETHTOOL_A_COALESCE_CNT,
ETHTOOL_A_COALESCE_MAX = (__ETHTOOL_A_COALESCE_CNT - 1)
};
enum {
- ETHTOOL_A_PROFILE_UNSPEC,
- ETHTOOL_A_PROFILE_IRQ_MODERATION,
- __ETHTOOL_A_PROFILE_CNT,
- ETHTOOL_A_PROFILE_MAX = (__ETHTOOL_A_PROFILE_CNT - 1)
-};
-enum {
- ETHTOOL_A_IRQ_MODERATION_UNSPEC,
- ETHTOOL_A_IRQ_MODERATION_USEC,
- ETHTOOL_A_IRQ_MODERATION_PKTS,
- ETHTOOL_A_IRQ_MODERATION_COMPS,
- __ETHTOOL_A_IRQ_MODERATION_CNT,
- ETHTOOL_A_IRQ_MODERATION_MAX = (__ETHTOOL_A_IRQ_MODERATION_CNT - 1)
-};
-enum {
ETHTOOL_A_PAUSE_UNSPEC,
ETHTOOL_A_PAUSE_HEADER,
ETHTOOL_A_PAUSE_AUTONEG,
@@ -653,11 +635,6 @@
ETHTOOL_A_MODULE_MAX = (__ETHTOOL_A_MODULE_CNT - 1)
};
enum {
- ETHTOOL_A_C33_PSE_PW_LIMIT_UNSPEC,
- ETHTOOL_A_C33_PSE_PW_LIMIT_MIN,
- ETHTOOL_A_C33_PSE_PW_LIMIT_MAX,
-};
-enum {
ETHTOOL_A_PSE_UNSPEC,
ETHTOOL_A_PSE_HEADER,
ETHTOOL_A_PODL_PSE_ADMIN_STATE,
@@ -666,12 +643,6 @@
ETHTOOL_A_C33_PSE_ADMIN_STATE,
ETHTOOL_A_C33_PSE_ADMIN_CONTROL,
ETHTOOL_A_C33_PSE_PW_D_STATUS,
- ETHTOOL_A_C33_PSE_PW_CLASS,
- ETHTOOL_A_C33_PSE_ACTUAL_PW,
- ETHTOOL_A_C33_PSE_EXT_STATE,
- ETHTOOL_A_C33_PSE_EXT_SUBSTATE,
- ETHTOOL_A_C33_PSE_AVAIL_PW_LIMIT,
- ETHTOOL_A_C33_PSE_PW_LIMIT_RANGES,
__ETHTOOL_A_PSE_CNT,
ETHTOOL_A_PSE_MAX = (__ETHTOOL_A_PSE_CNT - 1)
};
@@ -728,18 +699,6 @@
__ETHTOOL_A_MM_CNT,
ETHTOOL_A_MM_MAX = (__ETHTOOL_A_MM_CNT - 1)
};
-enum {
- ETHTOOL_A_MODULE_FW_FLASH_UNSPEC,
- ETHTOOL_A_MODULE_FW_FLASH_HEADER,
- ETHTOOL_A_MODULE_FW_FLASH_FILE_NAME,
- ETHTOOL_A_MODULE_FW_FLASH_PASSWORD,
- ETHTOOL_A_MODULE_FW_FLASH_STATUS,
- ETHTOOL_A_MODULE_FW_FLASH_STATUS_MSG,
- ETHTOOL_A_MODULE_FW_FLASH_DONE,
- ETHTOOL_A_MODULE_FW_FLASH_TOTAL,
- __ETHTOOL_A_MODULE_FW_FLASH_CNT,
- ETHTOOL_A_MODULE_FW_FLASH_MAX = (__ETHTOOL_A_MODULE_FW_FLASH_CNT - 1)
-};
#define ETHTOOL_GENL_NAME "ethtool"
#define ETHTOOL_GENL_VERSION 1
#define ETHTOOL_MCGRP_MONITOR_NAME "monitor"
diff --git a/libc/kernel/uapi/linux/fs.h b/libc/kernel/uapi/linux/fs.h
index adab56f..38a2d9e 100644
--- a/libc/kernel/uapi/linux/fs.h
+++ b/libc/kernel/uapi/linux/fs.h
@@ -194,10 +194,8 @@
#define RWF_NOWAIT (( __kernel_rwf_t) 0x00000008)
#define RWF_APPEND (( __kernel_rwf_t) 0x00000010)
#define RWF_NOAPPEND (( __kernel_rwf_t) 0x00000020)
-#define RWF_ATOMIC (( __kernel_rwf_t) 0x00000040)
-#define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND | RWF_NOAPPEND | RWF_ATOMIC)
-#define PROCFS_IOCTL_MAGIC 'f'
-#define PAGEMAP_SCAN _IOWR(PROCFS_IOCTL_MAGIC, 16, struct pm_scan_arg)
+#define RWF_SUPPORTED (RWF_HIPRI | RWF_DSYNC | RWF_SYNC | RWF_NOWAIT | RWF_APPEND | RWF_NOAPPEND)
+#define PAGEMAP_SCAN _IOWR('f', 16, struct pm_scan_arg)
#define PAGE_IS_WPALLOWED (1 << 0)
#define PAGE_IS_WRITTEN (1 << 1)
#define PAGE_IS_FILE (1 << 2)
@@ -227,30 +225,4 @@
__u64 category_anyof_mask;
__u64 return_mask;
};
-#define PROCMAP_QUERY _IOWR(PROCFS_IOCTL_MAGIC, 17, struct procmap_query)
-enum procmap_query_flags {
- PROCMAP_QUERY_VMA_READABLE = 0x01,
- PROCMAP_QUERY_VMA_WRITABLE = 0x02,
- PROCMAP_QUERY_VMA_EXECUTABLE = 0x04,
- PROCMAP_QUERY_VMA_SHARED = 0x08,
- PROCMAP_QUERY_COVERING_OR_NEXT_VMA = 0x10,
- PROCMAP_QUERY_FILE_BACKED_VMA = 0x20,
-};
-struct procmap_query {
- __u64 size;
- __u64 query_flags;
- __u64 query_addr;
- __u64 vma_start;
- __u64 vma_end;
- __u64 vma_flags;
- __u64 vma_page_size;
- __u64 vma_offset;
- __u64 inode;
- __u32 dev_major;
- __u32 dev_minor;
- __u32 vma_name_size;
- __u32 build_id_size;
- __u64 vma_name_addr;
- __u64 build_id_addr;
-};
#endif
diff --git a/libc/kernel/uapi/linux/if_xdp.h b/libc/kernel/uapi/linux/if_xdp.h
index 7201e06..b7eec87 100644
--- a/libc/kernel/uapi/linux/if_xdp.h
+++ b/libc/kernel/uapi/linux/if_xdp.h
@@ -14,7 +14,6 @@
#define XDP_USE_SG (1 << 4)
#define XDP_UMEM_UNALIGNED_CHUNK_FLAG (1 << 0)
#define XDP_UMEM_TX_SW_CSUM (1 << 1)
-#define XDP_UMEM_TX_METADATA_LEN (1 << 2)
struct sockaddr_xdp {
__u16 sxdp_family;
__u16 sxdp_flags;
diff --git a/libc/kernel/uapi/linux/iio/buffer.h b/libc/kernel/uapi/linux/iio/buffer.h
index 7e03a8c..45c6f65 100644
--- a/libc/kernel/uapi/linux/iio/buffer.h
+++ b/libc/kernel/uapi/linux/iio/buffer.h
@@ -6,16 +6,5 @@
*/
#ifndef _UAPI_IIO_BUFFER_H_
#define _UAPI_IIO_BUFFER_H_
-#include <linux/types.h>
-#define IIO_BUFFER_DMABUF_CYCLIC (1 << 0)
-#define IIO_BUFFER_DMABUF_SUPPORTED_FLAGS 0x00000001
-struct iio_dmabuf {
- __u32 fd;
- __u32 flags;
- __u64 bytes_used;
-};
#define IIO_BUFFER_GET_FD_IOCTL _IOWR('i', 0x91, int)
-#define IIO_BUFFER_DMABUF_ATTACH_IOCTL _IOW('i', 0x92, int)
-#define IIO_BUFFER_DMABUF_DETACH_IOCTL _IOW('i', 0x93, int)
-#define IIO_BUFFER_DMABUF_ENQUEUE_IOCTL _IOW('i', 0x94, struct iio_dmabuf)
#endif
diff --git a/libc/kernel/uapi/linux/in.h b/libc/kernel/uapi/linux/in.h
index 97bf493..44efdd8 100644
--- a/libc/kernel/uapi/linux/in.h
+++ b/libc/kernel/uapi/linux/in.h
@@ -69,8 +69,6 @@
#define IPPROTO_ETHERNET IPPROTO_ETHERNET
IPPROTO_RAW = 255,
#define IPPROTO_RAW IPPROTO_RAW
- IPPROTO_SMC = 256,
-#define IPPROTO_SMC IPPROTO_SMC
IPPROTO_MPTCP = 262,
#define IPPROTO_MPTCP IPPROTO_MPTCP
IPPROTO_MAX
diff --git a/libc/kernel/uapi/linux/io_uring.h b/libc/kernel/uapi/linux/io_uring.h
index 6b4f2ea..5505963 100644
--- a/libc/kernel/uapi/linux/io_uring.h
+++ b/libc/kernel/uapi/linux/io_uring.h
@@ -176,8 +176,6 @@
IORING_OP_FUTEX_WAITV,
IORING_OP_FIXED_FD_INSTALL,
IORING_OP_FTRUNCATE,
- IORING_OP_BIND,
- IORING_OP_LISTEN,
IORING_OP_LAST,
};
#define IORING_URING_CMD_FIXED (1U << 0)
diff --git a/libc/kernel/uapi/linux/iommufd.h b/libc/kernel/uapi/linux/iommufd.h
index 6f663b4..2570628 100644
--- a/libc/kernel/uapi/linux/iommufd.h
+++ b/libc/kernel/uapi/linux/iommufd.h
@@ -12,20 +12,19 @@
enum {
IOMMUFD_CMD_BASE = 0x80,
IOMMUFD_CMD_DESTROY = IOMMUFD_CMD_BASE,
- IOMMUFD_CMD_IOAS_ALLOC = 0x81,
- IOMMUFD_CMD_IOAS_ALLOW_IOVAS = 0x82,
- IOMMUFD_CMD_IOAS_COPY = 0x83,
- IOMMUFD_CMD_IOAS_IOVA_RANGES = 0x84,
- IOMMUFD_CMD_IOAS_MAP = 0x85,
- IOMMUFD_CMD_IOAS_UNMAP = 0x86,
- IOMMUFD_CMD_OPTION = 0x87,
- IOMMUFD_CMD_VFIO_IOAS = 0x88,
- IOMMUFD_CMD_HWPT_ALLOC = 0x89,
- IOMMUFD_CMD_GET_HW_INFO = 0x8a,
- IOMMUFD_CMD_HWPT_SET_DIRTY_TRACKING = 0x8b,
- IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP = 0x8c,
- IOMMUFD_CMD_HWPT_INVALIDATE = 0x8d,
- IOMMUFD_CMD_FAULT_QUEUE_ALLOC = 0x8e,
+ IOMMUFD_CMD_IOAS_ALLOC,
+ IOMMUFD_CMD_IOAS_ALLOW_IOVAS,
+ IOMMUFD_CMD_IOAS_COPY,
+ IOMMUFD_CMD_IOAS_IOVA_RANGES,
+ IOMMUFD_CMD_IOAS_MAP,
+ IOMMUFD_CMD_IOAS_UNMAP,
+ IOMMUFD_CMD_OPTION,
+ IOMMUFD_CMD_VFIO_IOAS,
+ IOMMUFD_CMD_HWPT_ALLOC,
+ IOMMUFD_CMD_GET_HW_INFO,
+ IOMMUFD_CMD_HWPT_SET_DIRTY_TRACKING,
+ IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP,
+ IOMMUFD_CMD_HWPT_INVALIDATE,
};
struct iommu_destroy {
__u32 size;
@@ -123,7 +122,6 @@
enum iommufd_hwpt_alloc_flags {
IOMMU_HWPT_ALLOC_NEST_PARENT = 1 << 0,
IOMMU_HWPT_ALLOC_DIRTY_TRACKING = 1 << 1,
- IOMMU_HWPT_FAULT_ID_VALID = 1 << 2,
};
enum iommu_hwpt_vtd_s1_flags {
IOMMU_VTD_S1_SRE = 1 << 0,
@@ -137,8 +135,8 @@
__u32 __reserved;
};
enum iommu_hwpt_data_type {
- IOMMU_HWPT_DATA_NONE = 0,
- IOMMU_HWPT_DATA_VTD_S1 = 1,
+ IOMMU_HWPT_DATA_NONE,
+ IOMMU_HWPT_DATA_VTD_S1,
};
struct iommu_hwpt_alloc {
__u32 size;
@@ -150,8 +148,6 @@
__u32 data_type;
__u32 data_len;
__aligned_u64 data_uptr;
- __u32 fault_id;
- __u32 __reserved2;
};
#define IOMMU_HWPT_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_ALLOC)
enum iommu_hw_info_vtd_flags {
@@ -164,8 +160,8 @@
__aligned_u64 ecap_reg;
};
enum iommu_hw_info_type {
- IOMMU_HW_INFO_TYPE_NONE = 0,
- IOMMU_HW_INFO_TYPE_INTEL_VTD = 1,
+ IOMMU_HW_INFO_TYPE_NONE,
+ IOMMU_HW_INFO_TYPE_INTEL_VTD,
};
enum iommufd_hw_capabilities {
IOMMU_HW_CAP_DIRTY_TRACKING = 1 << 0,
@@ -206,7 +202,7 @@
};
#define IOMMU_HWPT_GET_DIRTY_BITMAP _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_GET_DIRTY_BITMAP)
enum iommu_hwpt_invalidate_data_type {
- IOMMU_HWPT_INVALIDATE_DATA_VTD_S1 = 0,
+ IOMMU_HWPT_INVALIDATE_DATA_VTD_S1,
};
enum iommu_hwpt_vtd_s1_invalidate_flags {
IOMMU_VTD_INV_FLAGS_LEAF = 1 << 0,
@@ -227,39 +223,4 @@
__u32 __reserved;
};
#define IOMMU_HWPT_INVALIDATE _IO(IOMMUFD_TYPE, IOMMUFD_CMD_HWPT_INVALIDATE)
-enum iommu_hwpt_pgfault_flags {
- IOMMU_PGFAULT_FLAGS_PASID_VALID = (1 << 0),
- IOMMU_PGFAULT_FLAGS_LAST_PAGE = (1 << 1),
-};
-enum iommu_hwpt_pgfault_perm {
- IOMMU_PGFAULT_PERM_READ = (1 << 0),
- IOMMU_PGFAULT_PERM_WRITE = (1 << 1),
- IOMMU_PGFAULT_PERM_EXEC = (1 << 2),
- IOMMU_PGFAULT_PERM_PRIV = (1 << 3),
-};
-struct iommu_hwpt_pgfault {
- __u32 flags;
- __u32 dev_id;
- __u32 pasid;
- __u32 grpid;
- __u32 perm;
- __u64 addr;
- __u32 length;
- __u32 cookie;
-};
-enum iommufd_page_response_code {
- IOMMUFD_PAGE_RESP_SUCCESS = 0,
- IOMMUFD_PAGE_RESP_INVALID = 1,
-};
-struct iommu_hwpt_page_response {
- __u32 cookie;
- __u32 code;
-};
-struct iommu_fault_alloc {
- __u32 size;
- __u32 flags;
- __u32 out_fault_id;
- __u32 out_fault_fd;
-};
-#define IOMMU_FAULT_QUEUE_ALLOC _IO(IOMMUFD_TYPE, IOMMUFD_CMD_FAULT_QUEUE_ALLOC)
#endif
diff --git a/libc/kernel/uapi/linux/kfd_ioctl.h b/libc/kernel/uapi/linux/kfd_ioctl.h
index 193dd8e..62c9872 100644
--- a/libc/kernel/uapi/linux/kfd_ioctl.h
+++ b/libc/kernel/uapi/linux/kfd_ioctl.h
@@ -9,7 +9,7 @@
#include <drm/drm.h>
#include <linux/ioctl.h>
#define KFD_IOCTL_MAJOR_VERSION 1
-#define KFD_IOCTL_MINOR_VERSION 16
+#define KFD_IOCTL_MINOR_VERSION 15
struct kfd_ioctl_get_version_args {
__u32 major_version;
__u32 minor_version;
@@ -269,7 +269,6 @@
#define KFD_IOC_ALLOC_MEM_FLAGS_COHERENT (1 << 26)
#define KFD_IOC_ALLOC_MEM_FLAGS_UNCACHED (1 << 25)
#define KFD_IOC_ALLOC_MEM_FLAGS_EXT_COHERENT (1 << 24)
-#define KFD_IOC_ALLOC_MEM_FLAGS_CONTIGUOUS (1 << 23)
struct kfd_ioctl_alloc_memory_of_gpu_args {
__u64 va_addr;
__u64 size;
@@ -466,7 +465,6 @@
};
enum kfd_dbg_trap_flags {
KFD_DBG_TRAP_FLAG_SINGLE_MEM_OP = 1,
- KFD_DBG_TRAP_FLAG_SINGLE_ALU_OP = 2,
};
enum kfd_dbg_trap_exception_code {
EC_NONE = 0,
diff --git a/libc/kernel/uapi/linux/kfd_sysfs.h b/libc/kernel/uapi/linux/kfd_sysfs.h
index 7771582..e538cf2 100644
--- a/libc/kernel/uapi/linux/kfd_sysfs.h
+++ b/libc/kernel/uapi/linux/kfd_sysfs.h
@@ -35,8 +35,7 @@
#define HSA_CAP_SVMAPI_SUPPORTED 0x08000000
#define HSA_CAP_FLAGS_COHERENTHOSTACCESS 0x10000000
#define HSA_CAP_TRAP_DEBUG_FIRMWARE_SUPPORTED 0x20000000
-#define HSA_CAP_TRAP_DEBUG_PRECISE_ALU_OPERATIONS_SUPPORTED 0x40000000
-#define HSA_CAP_RESERVED 0x800f8000
+#define HSA_CAP_RESERVED 0xe00f8000
#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_MASK 0x0000000f
#define HSA_DBG_WATCH_ADDR_MASK_LO_BIT_SHIFT 0
#define HSA_DBG_WATCH_ADDR_MASK_HI_BIT_MASK 0x000003f0
diff --git a/libc/kernel/uapi/linux/kvm.h b/libc/kernel/uapi/linux/kvm.h
index 297a09d..ffaf5e6 100644
--- a/libc/kernel/uapi/linux/kvm.h
+++ b/libc/kernel/uapi/linux/kvm.h
@@ -149,10 +149,9 @@
#define KVM_INTERNAL_ERROR_DELIVERY_EV 3
#define KVM_INTERNAL_ERROR_UNEXPECTED_EXIT_REASON 4
#define KVM_INTERNAL_ERROR_EMULATION_FLAG_INSTRUCTION_BYTES (1ULL << 0)
-#define HINT_UNSAFE_IN_KVM(_symbol) _symbol
struct kvm_run {
__u8 request_interrupt_window;
- __u8 HINT_UNSAFE_IN_KVM(immediate_exit);
+ __u8 immediate_exit;
__u8 padding1[6];
__u32 exit_reason;
__u8 ready_for_interrupt_injection;
@@ -720,9 +719,6 @@
#define KVM_CAP_MEMORY_ATTRIBUTES 233
#define KVM_CAP_GUEST_MEMFD 234
#define KVM_CAP_VM_TYPES 235
-#define KVM_CAP_PRE_FAULT_MEMORY 236
-#define KVM_CAP_X86_APIC_BUS_CYCLES_NS 237
-#define KVM_CAP_X86_GUEST_MODE 238
struct kvm_irq_routing_irqchip {
__u32 irqchip;
__u32 pin;
@@ -1113,11 +1109,4 @@
__u64 flags;
__u64 reserved[6];
};
-#define KVM_PRE_FAULT_MEMORY _IOWR(KVMIO, 0xd5, struct kvm_pre_fault_memory)
-struct kvm_pre_fault_memory {
- __u64 gpa;
- __u64 size;
- __u64 flags;
- __u64 padding[5];
-};
#endif
diff --git a/libc/kernel/uapi/linux/media/raspberrypi/pisp_be_config.h b/libc/kernel/uapi/linux/media/raspberrypi/pisp_be_config.h
deleted file mode 100644
index 2e981ad..0000000
--- a/libc/kernel/uapi/linux/media/raspberrypi/pisp_be_config.h
+++ /dev/null
@@ -1,418 +0,0 @@
-/*
- * This file is auto-generated. Modifications will be lost.
- *
- * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
- * for more information.
- */
-#ifndef _UAPI_PISP_BE_CONFIG_H_
-#define _UAPI_PISP_BE_CONFIG_H_
-#include <linux/types.h>
-#include "pisp_common.h"
-#define PISP_BACK_END_INPUT_ALIGN 4u
-#define PISP_BACK_END_COMPRESSED_ALIGN 8u
-#define PISP_BACK_END_OUTPUT_MIN_ALIGN 16u
-#define PISP_BACK_END_OUTPUT_MAX_ALIGN 64u
-#define PISP_BACK_END_MIN_TILE_WIDTH 16u
-#define PISP_BACK_END_MIN_TILE_HEIGHT 16u
-#define PISP_BACK_END_NUM_OUTPUTS 2
-#define PISP_BACK_END_HOG_OUTPUT 1
-#define PISP_BACK_END_NUM_TILES 64
-enum pisp_be_bayer_enable {
- PISP_BE_BAYER_ENABLE_INPUT = 0x000001,
- PISP_BE_BAYER_ENABLE_DECOMPRESS = 0x000002,
- PISP_BE_BAYER_ENABLE_DPC = 0x000004,
- PISP_BE_BAYER_ENABLE_GEQ = 0x000008,
- PISP_BE_BAYER_ENABLE_TDN_INPUT = 0x000010,
- PISP_BE_BAYER_ENABLE_TDN_DECOMPRESS = 0x000020,
- PISP_BE_BAYER_ENABLE_TDN = 0x000040,
- PISP_BE_BAYER_ENABLE_TDN_COMPRESS = 0x000080,
- PISP_BE_BAYER_ENABLE_TDN_OUTPUT = 0x000100,
- PISP_BE_BAYER_ENABLE_SDN = 0x000200,
- PISP_BE_BAYER_ENABLE_BLC = 0x000400,
- PISP_BE_BAYER_ENABLE_STITCH_INPUT = 0x000800,
- PISP_BE_BAYER_ENABLE_STITCH_DECOMPRESS = 0x001000,
- PISP_BE_BAYER_ENABLE_STITCH = 0x002000,
- PISP_BE_BAYER_ENABLE_STITCH_COMPRESS = 0x004000,
- PISP_BE_BAYER_ENABLE_STITCH_OUTPUT = 0x008000,
- PISP_BE_BAYER_ENABLE_WBG = 0x010000,
- PISP_BE_BAYER_ENABLE_CDN = 0x020000,
- PISP_BE_BAYER_ENABLE_LSC = 0x040000,
- PISP_BE_BAYER_ENABLE_TONEMAP = 0x080000,
- PISP_BE_BAYER_ENABLE_CAC = 0x100000,
- PISP_BE_BAYER_ENABLE_DEBIN = 0x200000,
- PISP_BE_BAYER_ENABLE_DEMOSAIC = 0x400000,
-};
-enum pisp_be_rgb_enable {
- PISP_BE_RGB_ENABLE_INPUT = 0x000001,
- PISP_BE_RGB_ENABLE_CCM = 0x000002,
- PISP_BE_RGB_ENABLE_SAT_CONTROL = 0x000004,
- PISP_BE_RGB_ENABLE_YCBCR = 0x000008,
- PISP_BE_RGB_ENABLE_FALSE_COLOUR = 0x000010,
- PISP_BE_RGB_ENABLE_SHARPEN = 0x000020,
- PISP_BE_RGB_ENABLE_YCBCR_INVERSE = 0x000080,
- PISP_BE_RGB_ENABLE_GAMMA = 0x000100,
- PISP_BE_RGB_ENABLE_CSC0 = 0x000200,
- PISP_BE_RGB_ENABLE_CSC1 = 0x000400,
- PISP_BE_RGB_ENABLE_DOWNSCALE0 = 0x001000,
- PISP_BE_RGB_ENABLE_DOWNSCALE1 = 0x002000,
- PISP_BE_RGB_ENABLE_RESAMPLE0 = 0x008000,
- PISP_BE_RGB_ENABLE_RESAMPLE1 = 0x010000,
- PISP_BE_RGB_ENABLE_OUTPUT0 = 0x040000,
- PISP_BE_RGB_ENABLE_OUTPUT1 = 0x080000,
- PISP_BE_RGB_ENABLE_HOG = 0x200000
-};
-#define PISP_BE_RGB_ENABLE_CSC(i) (PISP_BE_RGB_ENABLE_CSC0 << (i))
-#define PISP_BE_RGB_ENABLE_DOWNSCALE(i) (PISP_BE_RGB_ENABLE_DOWNSCALE0 << (i))
-#define PISP_BE_RGB_ENABLE_RESAMPLE(i) (PISP_BE_RGB_ENABLE_RESAMPLE0 << (i))
-#define PISP_BE_RGB_ENABLE_OUTPUT(i) (PISP_BE_RGB_ENABLE_OUTPUT0 << (i))
-enum pisp_be_dirty {
- PISP_BE_DIRTY_GLOBAL = 0x0001,
- PISP_BE_DIRTY_SH_FC_COMBINE = 0x0002,
- PISP_BE_DIRTY_CROP = 0x0004
-};
-struct pisp_be_global_config {
- __u32 bayer_enables;
- __u32 rgb_enables;
- __u8 bayer_order;
- __u8 pad[3];
-} __attribute__((packed));
-struct pisp_be_input_buffer_config {
- __u32 addr[3][2];
-} __attribute__((packed));
-struct pisp_be_dpc_config {
- __u8 coeff_level;
- __u8 coeff_range;
- __u8 pad;
-#define PISP_BE_DPC_FLAG_FOLDBACK 1
- __u8 flags;
-} __attribute__((packed));
-struct pisp_be_geq_config {
- __u16 offset;
-#define PISP_BE_GEQ_SHARPER (1U << 15)
-#define PISP_BE_GEQ_SLOPE ((1 << 10) - 1)
- __u16 slope_sharper;
- __u16 min;
- __u16 max;
-} __attribute__((packed));
-struct pisp_be_tdn_input_buffer_config {
- __u32 addr[2];
-} __attribute__((packed));
-struct pisp_be_tdn_config {
- __u16 black_level;
- __u16 ratio;
- __u16 noise_constant;
- __u16 noise_slope;
- __u16 threshold;
- __u8 reset;
- __u8 pad;
-} __attribute__((packed));
-struct pisp_be_tdn_output_buffer_config {
- __u32 addr[2];
-} __attribute__((packed));
-struct pisp_be_sdn_config {
- __u16 black_level;
- __u8 leakage;
- __u8 pad;
- __u16 noise_constant;
- __u16 noise_slope;
- __u16 noise_constant2;
- __u16 noise_slope2;
-} __attribute__((packed));
-struct pisp_be_stitch_input_buffer_config {
- __u32 addr[2];
-} __attribute__((packed));
-#define PISP_BE_STITCH_STREAMING_LONG 0x8000
-#define PISP_BE_STITCH_EXPOSURE_RATIO_MASK 0x7fff
-struct pisp_be_stitch_config {
- __u16 threshold_lo;
- __u8 threshold_diff_power;
- __u8 pad;
- __u16 exposure_ratio;
- __u8 motion_threshold_256;
- __u8 motion_threshold_recip;
-} __attribute__((packed));
-struct pisp_be_stitch_output_buffer_config {
- __u32 addr[2];
-} __attribute__((packed));
-struct pisp_be_cdn_config {
- __u16 thresh;
- __u8 iir_strength;
- __u8 g_adjust;
-} __attribute__((packed));
-#define PISP_BE_LSC_LOG_GRID_SIZE 5
-#define PISP_BE_LSC_GRID_SIZE (1 << PISP_BE_LSC_LOG_GRID_SIZE)
-#define PISP_BE_LSC_STEP_PRECISION 18
-struct pisp_be_lsc_config {
- __u16 grid_step_x;
- __u16 grid_step_y;
-#define PISP_BE_LSC_LUT_SIZE (PISP_BE_LSC_GRID_SIZE + 1)
- __u32 lut_packed[PISP_BE_LSC_LUT_SIZE][PISP_BE_LSC_LUT_SIZE];
-} __attribute__((packed));
-struct pisp_be_lsc_extra {
- __u16 offset_x;
- __u16 offset_y;
-} __attribute__((packed));
-#define PISP_BE_CAC_LOG_GRID_SIZE 3
-#define PISP_BE_CAC_GRID_SIZE (1 << PISP_BE_CAC_LOG_GRID_SIZE)
-#define PISP_BE_CAC_STEP_PRECISION 20
-struct pisp_be_cac_config {
- __u16 grid_step_x;
- __u16 grid_step_y;
-#define PISP_BE_CAC_LUT_SIZE (PISP_BE_CAC_GRID_SIZE + 1)
- __s8 lut[PISP_BE_CAC_LUT_SIZE][PISP_BE_CAC_LUT_SIZE][2][2];
-} __attribute__((packed));
-struct pisp_be_cac_extra {
- __u16 offset_x;
- __u16 offset_y;
-} __attribute__((packed));
-#define PISP_BE_DEBIN_NUM_COEFFS 4
-struct pisp_be_debin_config {
- __s8 coeffs[PISP_BE_DEBIN_NUM_COEFFS];
- __s8 h_enable;
- __s8 v_enable;
- __s8 pad[2];
-} __attribute__((packed));
-#define PISP_BE_TONEMAP_LUT_SIZE 64
-struct pisp_be_tonemap_config {
- __u16 detail_constant;
- __u16 detail_slope;
- __u16 iir_strength;
- __u16 strength;
- __u32 lut[PISP_BE_TONEMAP_LUT_SIZE];
-} __attribute__((packed));
-struct pisp_be_demosaic_config {
- __u8 sharper;
- __u8 fc_mode;
- __u8 pad[2];
-} __attribute__((packed));
-struct pisp_be_ccm_config {
- __s16 coeffs[9];
- __u8 pad[2];
- __s32 offsets[3];
-} __attribute__((packed));
-struct pisp_be_sat_control_config {
- __u8 shift_r;
- __u8 shift_g;
- __u8 shift_b;
- __u8 pad;
-} __attribute__((packed));
-struct pisp_be_false_colour_config {
- __u8 distance;
- __u8 pad[3];
-} __attribute__((packed));
-#define PISP_BE_SHARPEN_SIZE 5
-#define PISP_BE_SHARPEN_FUNC_NUM_POINTS 9
-struct pisp_be_sharpen_config {
- __s8 kernel0[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
- __s8 pad0[3];
- __s8 kernel1[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
- __s8 pad1[3];
- __s8 kernel2[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
- __s8 pad2[3];
- __s8 kernel3[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
- __s8 pad3[3];
- __s8 kernel4[PISP_BE_SHARPEN_SIZE * PISP_BE_SHARPEN_SIZE];
- __s8 pad4[3];
- __u16 threshold_offset0;
- __u16 threshold_slope0;
- __u16 scale0;
- __u16 pad5;
- __u16 threshold_offset1;
- __u16 threshold_slope1;
- __u16 scale1;
- __u16 pad6;
- __u16 threshold_offset2;
- __u16 threshold_slope2;
- __u16 scale2;
- __u16 pad7;
- __u16 threshold_offset3;
- __u16 threshold_slope3;
- __u16 scale3;
- __u16 pad8;
- __u16 threshold_offset4;
- __u16 threshold_slope4;
- __u16 scale4;
- __u16 pad9;
- __u16 positive_strength;
- __u16 positive_pre_limit;
- __u16 positive_func[PISP_BE_SHARPEN_FUNC_NUM_POINTS];
- __u16 positive_limit;
- __u16 negative_strength;
- __u16 negative_pre_limit;
- __u16 negative_func[PISP_BE_SHARPEN_FUNC_NUM_POINTS];
- __u16 negative_limit;
- __u8 enables;
- __u8 white;
- __u8 black;
- __u8 grey;
-} __attribute__((packed));
-struct pisp_be_sh_fc_combine_config {
- __u8 y_factor;
- __u8 c1_factor;
- __u8 c2_factor;
- __u8 pad;
-} __attribute__((packed));
-#define PISP_BE_GAMMA_LUT_SIZE 64
-struct pisp_be_gamma_config {
- __u32 lut[PISP_BE_GAMMA_LUT_SIZE];
-} __attribute__((packed));
-struct pisp_be_crop_config {
- __u16 offset_x, offset_y;
- __u16 width, height;
-} __attribute__((packed));
-#define PISP_BE_RESAMPLE_FILTER_SIZE 96
-struct pisp_be_resample_config {
- __u16 scale_factor_h, scale_factor_v;
- __s16 coef[PISP_BE_RESAMPLE_FILTER_SIZE];
-} __attribute__((packed));
-struct pisp_be_resample_extra {
- __u16 scaled_width;
- __u16 scaled_height;
- __s16 initial_phase_h[3];
- __s16 initial_phase_v[3];
-} __attribute__((packed));
-struct pisp_be_downscale_config {
- __u16 scale_factor_h;
- __u16 scale_factor_v;
- __u16 scale_recip_h;
- __u16 scale_recip_v;
-} __attribute__((packed));
-struct pisp_be_downscale_extra {
- __u16 scaled_width;
- __u16 scaled_height;
-} __attribute__((packed));
-struct pisp_be_hog_config {
- __u8 compute_signed;
- __u8 channel_mix[3];
- __u32 stride;
-} __attribute__((packed));
-struct pisp_be_axi_config {
- __u8 r_qos;
- __u8 r_cache_prot;
- __u8 w_qos;
- __u8 w_cache_prot;
-} __attribute__((packed));
-enum pisp_be_transform {
- PISP_BE_TRANSFORM_NONE = 0x0,
- PISP_BE_TRANSFORM_HFLIP = 0x1,
- PISP_BE_TRANSFORM_VFLIP = 0x2,
- PISP_BE_TRANSFORM_ROT180 = (PISP_BE_TRANSFORM_HFLIP | PISP_BE_TRANSFORM_VFLIP)
-};
-struct pisp_be_output_format_config {
- struct pisp_image_format_config image;
- __u8 transform;
- __u8 pad[3];
- __u16 lo;
- __u16 hi;
- __u16 lo2;
- __u16 hi2;
-} __attribute__((packed));
-struct pisp_be_output_buffer_config {
- __u32 addr[3][2];
-} __attribute__((packed));
-struct pisp_be_hog_buffer_config {
- __u32 addr[2];
-} __attribute__((packed));
-struct pisp_be_config {
- struct pisp_be_input_buffer_config input_buffer;
- struct pisp_be_tdn_input_buffer_config tdn_input_buffer;
- struct pisp_be_stitch_input_buffer_config stitch_input_buffer;
- struct pisp_be_tdn_output_buffer_config tdn_output_buffer;
- struct pisp_be_stitch_output_buffer_config stitch_output_buffer;
- struct pisp_be_output_buffer_config output_buffer[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_hog_buffer_config hog_buffer;
- struct pisp_be_global_config global;
- struct pisp_image_format_config input_format;
- struct pisp_decompress_config decompress;
- struct pisp_be_dpc_config dpc;
- struct pisp_be_geq_config geq;
- struct pisp_image_format_config tdn_input_format;
- struct pisp_decompress_config tdn_decompress;
- struct pisp_be_tdn_config tdn;
- struct pisp_compress_config tdn_compress;
- struct pisp_image_format_config tdn_output_format;
- struct pisp_be_sdn_config sdn;
- struct pisp_bla_config blc;
- struct pisp_compress_config stitch_compress;
- struct pisp_image_format_config stitch_output_format;
- struct pisp_image_format_config stitch_input_format;
- struct pisp_decompress_config stitch_decompress;
- struct pisp_be_stitch_config stitch;
- struct pisp_be_lsc_config lsc;
- struct pisp_wbg_config wbg;
- struct pisp_be_cdn_config cdn;
- struct pisp_be_cac_config cac;
- struct pisp_be_debin_config debin;
- struct pisp_be_tonemap_config tonemap;
- struct pisp_be_demosaic_config demosaic;
- struct pisp_be_ccm_config ccm;
- struct pisp_be_sat_control_config sat_control;
- struct pisp_be_ccm_config ycbcr;
- struct pisp_be_sharpen_config sharpen;
- struct pisp_be_false_colour_config false_colour;
- struct pisp_be_sh_fc_combine_config sh_fc_combine;
- struct pisp_be_ccm_config ycbcr_inverse;
- struct pisp_be_gamma_config gamma;
- struct pisp_be_ccm_config csc[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_downscale_config downscale[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_resample_config resample[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_output_format_config output_format[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_hog_config hog;
- struct pisp_be_axi_config axi;
- struct pisp_be_lsc_extra lsc_extra;
- struct pisp_be_cac_extra cac_extra;
- struct pisp_be_downscale_extra downscale_extra[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_resample_extra resample_extra[PISP_BACK_END_NUM_OUTPUTS];
- struct pisp_be_crop_config crop;
- struct pisp_image_format_config hog_format;
- __u32 dirty_flags_bayer;
- __u32 dirty_flags_rgb;
- __u32 dirty_flags_extra;
-} __attribute__((packed));
-enum pisp_tile_edge {
- PISP_LEFT_EDGE = (1 << 0),
- PISP_RIGHT_EDGE = (1 << 1),
- PISP_TOP_EDGE = (1 << 2),
- PISP_BOTTOM_EDGE = (1 << 3)
-};
-struct pisp_tile {
- __u8 edge;
- __u8 pad0[3];
- __u32 input_addr_offset;
- __u32 input_addr_offset2;
- __u16 input_offset_x;
- __u16 input_offset_y;
- __u16 input_width;
- __u16 input_height;
- __u32 tdn_input_addr_offset;
- __u32 tdn_output_addr_offset;
- __u32 stitch_input_addr_offset;
- __u32 stitch_output_addr_offset;
- __u32 lsc_grid_offset_x;
- __u32 lsc_grid_offset_y;
- __u32 cac_grid_offset_x;
- __u32 cac_grid_offset_y;
- __u16 crop_x_start[PISP_BACK_END_NUM_OUTPUTS];
- __u16 crop_x_end[PISP_BACK_END_NUM_OUTPUTS];
- __u16 crop_y_start[PISP_BACK_END_NUM_OUTPUTS];
- __u16 crop_y_end[PISP_BACK_END_NUM_OUTPUTS];
- __u16 downscale_phase_x[3 * PISP_BACK_END_NUM_OUTPUTS];
- __u16 downscale_phase_y[3 * PISP_BACK_END_NUM_OUTPUTS];
- __u16 resample_in_width[PISP_BACK_END_NUM_OUTPUTS];
- __u16 resample_in_height[PISP_BACK_END_NUM_OUTPUTS];
- __u16 resample_phase_x[3 * PISP_BACK_END_NUM_OUTPUTS];
- __u16 resample_phase_y[3 * PISP_BACK_END_NUM_OUTPUTS];
- __u16 output_offset_x[PISP_BACK_END_NUM_OUTPUTS];
- __u16 output_offset_y[PISP_BACK_END_NUM_OUTPUTS];
- __u16 output_width[PISP_BACK_END_NUM_OUTPUTS];
- __u16 output_height[PISP_BACK_END_NUM_OUTPUTS];
- __u32 output_addr_offset[PISP_BACK_END_NUM_OUTPUTS];
- __u32 output_addr_offset2[PISP_BACK_END_NUM_OUTPUTS];
- __u32 output_hog_addr_offset;
-} __attribute__((packed));
-struct pisp_be_tiles_config {
- struct pisp_be_config config;
- struct pisp_tile tiles[PISP_BACK_END_NUM_TILES];
- __u32 num_tiles;
-} __attribute__((packed));
-#endif
diff --git a/libc/kernel/uapi/linux/media/raspberrypi/pisp_common.h b/libc/kernel/uapi/linux/media/raspberrypi/pisp_common.h
deleted file mode 100644
index 0e0b23f..0000000
--- a/libc/kernel/uapi/linux/media/raspberrypi/pisp_common.h
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * This file is auto-generated. Modifications will be lost.
- *
- * See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
- * for more information.
- */
-#ifndef _UAPI_PISP_COMMON_H_
-#define _UAPI_PISP_COMMON_H_
-#include <linux/types.h>
-struct pisp_image_format_config {
- __u16 width;
- __u16 height;
- __u32 format;
- __s32 stride;
- __s32 stride2;
-} __attribute__((packed));
-enum pisp_bayer_order {
- PISP_BAYER_ORDER_RGGB = 0,
- PISP_BAYER_ORDER_GBRG = 1,
- PISP_BAYER_ORDER_BGGR = 2,
- PISP_BAYER_ORDER_GRBG = 3,
- PISP_BAYER_ORDER_GREYSCALE = 128
-};
-enum pisp_image_format {
- PISP_IMAGE_FORMAT_BPS_8 = 0x00000000,
- PISP_IMAGE_FORMAT_BPS_10 = 0x00000001,
- PISP_IMAGE_FORMAT_BPS_12 = 0x00000002,
- PISP_IMAGE_FORMAT_BPS_16 = 0x00000003,
- PISP_IMAGE_FORMAT_BPS_MASK = 0x00000003,
- PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED = 0x00000000,
- PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR = 0x00000010,
- PISP_IMAGE_FORMAT_PLANARITY_PLANAR = 0x00000020,
- PISP_IMAGE_FORMAT_PLANARITY_MASK = 0x00000030,
- PISP_IMAGE_FORMAT_SAMPLING_444 = 0x00000000,
- PISP_IMAGE_FORMAT_SAMPLING_422 = 0x00000100,
- PISP_IMAGE_FORMAT_SAMPLING_420 = 0x00000200,
- PISP_IMAGE_FORMAT_SAMPLING_MASK = 0x00000300,
- PISP_IMAGE_FORMAT_ORDER_NORMAL = 0x00000000,
- PISP_IMAGE_FORMAT_ORDER_SWAPPED = 0x00001000,
- PISP_IMAGE_FORMAT_SHIFT_0 = 0x00000000,
- PISP_IMAGE_FORMAT_SHIFT_1 = 0x00010000,
- PISP_IMAGE_FORMAT_SHIFT_2 = 0x00020000,
- PISP_IMAGE_FORMAT_SHIFT_3 = 0x00030000,
- PISP_IMAGE_FORMAT_SHIFT_4 = 0x00040000,
- PISP_IMAGE_FORMAT_SHIFT_5 = 0x00050000,
- PISP_IMAGE_FORMAT_SHIFT_6 = 0x00060000,
- PISP_IMAGE_FORMAT_SHIFT_7 = 0x00070000,
- PISP_IMAGE_FORMAT_SHIFT_8 = 0x00080000,
- PISP_IMAGE_FORMAT_SHIFT_MASK = 0x000f0000,
- PISP_IMAGE_FORMAT_BPP_32 = 0x00100000,
- PISP_IMAGE_FORMAT_UNCOMPRESSED = 0x00000000,
- PISP_IMAGE_FORMAT_COMPRESSION_MODE_1 = 0x01000000,
- PISP_IMAGE_FORMAT_COMPRESSION_MODE_2 = 0x02000000,
- PISP_IMAGE_FORMAT_COMPRESSION_MODE_3 = 0x03000000,
- PISP_IMAGE_FORMAT_COMPRESSION_MASK = 0x03000000,
- PISP_IMAGE_FORMAT_HOG_SIGNED = 0x04000000,
- PISP_IMAGE_FORMAT_HOG_UNSIGNED = 0x08000000,
- PISP_IMAGE_FORMAT_INTEGRAL_IMAGE = 0x10000000,
- PISP_IMAGE_FORMAT_WALLPAPER_ROLL = 0x20000000,
- PISP_IMAGE_FORMAT_THREE_CHANNEL = 0x40000000,
- PISP_IMAGE_FORMAT_SINGLE_16 = PISP_IMAGE_FORMAT_BPS_16,
- PISP_IMAGE_FORMAT_THREE_16 = PISP_IMAGE_FORMAT_BPS_16 | PISP_IMAGE_FORMAT_THREE_CHANNEL
-};
-#define PISP_IMAGE_FORMAT_BPS_8(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_8)
-#define PISP_IMAGE_FORMAT_BPS_10(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_10)
-#define PISP_IMAGE_FORMAT_BPS_12(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_12)
-#define PISP_IMAGE_FORMAT_BPS_16(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) == PISP_IMAGE_FORMAT_BPS_16)
-#define PISP_IMAGE_FORMAT_BPS(fmt) (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) ? 8 + (2 << (((fmt) & PISP_IMAGE_FORMAT_BPS_MASK) - 1)) : 8)
-#define PISP_IMAGE_FORMAT_SHIFT(fmt) (((fmt) & PISP_IMAGE_FORMAT_SHIFT_MASK) / PISP_IMAGE_FORMAT_SHIFT_1)
-#define PISP_IMAGE_FORMAT_THREE_CHANNEL(fmt) ((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL)
-#define PISP_IMAGE_FORMAT_SINGLE_CHANNEL(fmt) (! ((fmt) & PISP_IMAGE_FORMAT_THREE_CHANNEL))
-#define PISP_IMAGE_FORMAT_COMPRESSED(fmt) (((fmt) & PISP_IMAGE_FORMAT_COMPRESSION_MASK) != PISP_IMAGE_FORMAT_UNCOMPRESSED)
-#define PISP_IMAGE_FORMAT_SAMPLING_444(fmt) (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_444)
-#define PISP_IMAGE_FORMAT_SAMPLING_422(fmt) (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_422)
-#define PISP_IMAGE_FORMAT_SAMPLING_420(fmt) (((fmt) & PISP_IMAGE_FORMAT_SAMPLING_MASK) == PISP_IMAGE_FORMAT_SAMPLING_420)
-#define PISP_IMAGE_FORMAT_ORDER_NORMAL(fmt) (! ((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED))
-#define PISP_IMAGE_FORMAT_ORDER_SWAPPED(fmt) ((fmt) & PISP_IMAGE_FORMAT_ORDER_SWAPPED)
-#define PISP_IMAGE_FORMAT_INTERLEAVED(fmt) (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_INTERLEAVED)
-#define PISP_IMAGE_FORMAT_SEMIPLANAR(fmt) (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_SEMI_PLANAR)
-#define PISP_IMAGE_FORMAT_PLANAR(fmt) (((fmt) & PISP_IMAGE_FORMAT_PLANARITY_MASK) == PISP_IMAGE_FORMAT_PLANARITY_PLANAR)
-#define PISP_IMAGE_FORMAT_WALLPAPER(fmt) ((fmt) & PISP_IMAGE_FORMAT_WALLPAPER_ROLL)
-#define PISP_IMAGE_FORMAT_BPP_32(fmt) ((fmt) & PISP_IMAGE_FORMAT_BPP_32)
-#define PISP_IMAGE_FORMAT_HOG(fmt) ((fmt) & (PISP_IMAGE_FORMAT_HOG_SIGNED | PISP_IMAGE_FORMAT_HOG_UNSIGNED))
-#define PISP_WALLPAPER_WIDTH 128
-struct pisp_bla_config {
- __u16 black_level_r;
- __u16 black_level_gr;
- __u16 black_level_gb;
- __u16 black_level_b;
- __u16 output_black_level;
- __u8 pad[2];
-} __attribute__((packed));
-struct pisp_wbg_config {
- __u16 gain_r;
- __u16 gain_g;
- __u16 gain_b;
- __u8 pad[2];
-} __attribute__((packed));
-struct pisp_compress_config {
- __u16 offset;
- __u8 pad;
- __u8 mode;
-} __attribute__((packed));
-struct pisp_decompress_config {
- __u16 offset;
- __u8 pad;
- __u8 mode;
-} __attribute__((packed));
-enum pisp_axi_flags {
- PISP_AXI_FLAG_ALIGN = 128,
- PISP_AXI_FLAG_PAD = 64,
- PISP_AXI_FLAG_PANIC = 32,
-};
-struct pisp_axi_config {
- __u8 maxlen_flags;
- __u8 cache_prot;
- __u16 qos;
-} __attribute__((packed));
-#endif
diff --git a/libc/kernel/uapi/linux/mman.h b/libc/kernel/uapi/linux/mman.h
index f50b51c..cf1e978 100644
--- a/libc/kernel/uapi/linux/mman.h
+++ b/libc/kernel/uapi/linux/mman.h
@@ -18,7 +18,6 @@
#define MAP_SHARED 0x01
#define MAP_PRIVATE 0x02
#define MAP_SHARED_VALIDATE 0x03
-#define MAP_DROPPABLE 0x08
#define MAP_HUGE_SHIFT HUGETLB_FLAG_ENCODE_SHIFT
#define MAP_HUGE_MASK HUGETLB_FLAG_ENCODE_MASK
#define MAP_HUGE_16KB HUGETLB_FLAG_ENCODE_16KB
diff --git a/libc/kernel/uapi/linux/mount.h b/libc/kernel/uapi/linux/mount.h
index c4278b5..1166a7a 100644
--- a/libc/kernel/uapi/linux/mount.h
+++ b/libc/kernel/uapi/linux/mount.h
@@ -90,7 +90,7 @@
#define MOUNT_ATTR_SIZE_VER0 32
struct statmount {
__u32 size;
- __u32 mnt_opts;
+ __u32 __spare1;
__u64 mask;
__u32 sb_dev_major;
__u32 sb_dev_minor;
@@ -108,8 +108,7 @@
__u64 propagate_from;
__u32 mnt_root;
__u32 mnt_point;
- __u64 mnt_ns_id;
- __u64 __spare2[49];
+ __u64 __spare2[50];
char str[];
};
struct mnt_id_req {
@@ -117,18 +116,13 @@
__u32 spare;
__u64 mnt_id;
__u64 param;
- __u64 mnt_ns_id;
};
#define MNT_ID_REQ_SIZE_VER0 24
-#define MNT_ID_REQ_SIZE_VER1 32
#define STATMOUNT_SB_BASIC 0x00000001U
#define STATMOUNT_MNT_BASIC 0x00000002U
#define STATMOUNT_PROPAGATE_FROM 0x00000004U
#define STATMOUNT_MNT_ROOT 0x00000008U
#define STATMOUNT_MNT_POINT 0x00000010U
#define STATMOUNT_FS_TYPE 0x00000020U
-#define STATMOUNT_MNT_NS_ID 0x00000040U
-#define STATMOUNT_MNT_OPTS 0x00000080U
#define LSMT_ROOT 0xffffffffffffffff
-#define LISTMOUNT_REVERSE (1 << 0)
#endif
diff --git a/libc/kernel/uapi/linux/netfilter/nf_tables.h b/libc/kernel/uapi/linux/netfilter/nf_tables.h
index bfc6e25..7922147 100644
--- a/libc/kernel/uapi/linux/netfilter/nf_tables.h
+++ b/libc/kernel/uapi/linux/netfilter/nf_tables.h
@@ -695,7 +695,7 @@
__NFTA_SECMARK_MAX,
};
#define NFTA_SECMARK_MAX (__NFTA_SECMARK_MAX - 1)
-#define NFT_SECMARK_CTX_MAXLEN 4096
+#define NFT_SECMARK_CTX_MAXLEN 256
enum nft_reject_types {
NFT_REJECT_ICMP_UNREACH,
NFT_REJECT_TCP_RST,
diff --git a/libc/kernel/uapi/linux/nfs4.h b/libc/kernel/uapi/linux/nfs4.h
index 6512901..21f1103 100644
--- a/libc/kernel/uapi/linux/nfs4.h
+++ b/libc/kernel/uapi/linux/nfs4.h
@@ -34,7 +34,6 @@
#define NFS4_OPEN_RESULT_CONFIRM 0x0002
#define NFS4_OPEN_RESULT_LOCKTYPE_POSIX 0x0004
#define NFS4_OPEN_RESULT_PRESERVE_UNLINKED 0x0008
-#define NFS4_OPEN_RESULT_NO_OPEN_STATEID 0x0010
#define NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK 0x0020
#define NFS4_SHARE_ACCESS_MASK 0x000F
#define NFS4_SHARE_ACCESS_READ 0x0001
@@ -53,8 +52,6 @@
#define NFS4_SHARE_WHEN_MASK 0xF0000
#define NFS4_SHARE_SIGNAL_DELEG_WHEN_RESRC_AVAIL 0x10000
#define NFS4_SHARE_PUSH_DELEG_WHEN_UNCONTENDED 0x20000
-#define NFS4_SHARE_WANT_DELEG_TIMESTAMPS 0x100000
-#define NFS4_SHARE_WANT_OPEN_XOR_DELEGATION 0x200000
#define NFS4_CDFC4_FORE 0x1
#define NFS4_CDFC4_BACK 0x2
#define NFS4_CDFC4_BOTH 0x3
diff --git a/libc/kernel/uapi/linux/nfsd_netlink.h b/libc/kernel/uapi/linux/nfsd_netlink.h
index bd3f02c..45cb504 100644
--- a/libc/kernel/uapi/linux/nfsd_netlink.h
+++ b/libc/kernel/uapi/linux/nfsd_netlink.h
@@ -58,12 +58,6 @@
NFSD_A_SERVER_SOCK_MAX = (__NFSD_A_SERVER_SOCK_MAX - 1)
};
enum {
- NFSD_A_POOL_MODE_MODE = 1,
- NFSD_A_POOL_MODE_NPOOLS,
- __NFSD_A_POOL_MODE_MAX,
- NFSD_A_POOL_MODE_MAX = (__NFSD_A_POOL_MODE_MAX - 1)
-};
-enum {
NFSD_CMD_RPC_STATUS_GET = 1,
NFSD_CMD_THREADS_SET,
NFSD_CMD_THREADS_GET,
@@ -71,8 +65,6 @@
NFSD_CMD_VERSION_GET,
NFSD_CMD_LISTENER_SET,
NFSD_CMD_LISTENER_GET,
- NFSD_CMD_POOL_MODE_SET,
- NFSD_CMD_POOL_MODE_GET,
__NFSD_CMD_MAX,
NFSD_CMD_MAX = (__NFSD_CMD_MAX - 1)
};
diff --git a/libc/kernel/uapi/linux/nl80211.h b/libc/kernel/uapi/linux/nl80211.h
index 1bad2f2..98180c2 100644
--- a/libc/kernel/uapi/linux/nl80211.h
+++ b/libc/kernel/uapi/linux/nl80211.h
@@ -528,8 +528,6 @@
NL80211_ATTR_MLO_TTLM_DLINK,
NL80211_ATTR_MLO_TTLM_ULINK,
NL80211_ATTR_ASSOC_SPP_AMSDU,
- NL80211_ATTR_WIPHY_RADIOS,
- NL80211_ATTR_WIPHY_INTERFACE_COMBINATIONS,
__NL80211_ATTR_AFTER_LAST,
NUM_NL80211_ATTR = __NL80211_ATTR_AFTER_LAST,
NL80211_ATTR_MAX = __NL80211_ATTR_AFTER_LAST - 1
@@ -880,7 +878,6 @@
NL80211_FREQUENCY_ATTR_NO_6GHZ_VLP_CLIENT,
NL80211_FREQUENCY_ATTR_NO_6GHZ_AFC_CLIENT,
NL80211_FREQUENCY_ATTR_CAN_MONITOR,
- NL80211_FREQUENCY_ATTR_ALLOW_6GHZ_VLP_AP,
__NL80211_FREQUENCY_ATTR_AFTER_LAST,
NL80211_FREQUENCY_ATTR_MAX = __NL80211_FREQUENCY_ATTR_AFTER_LAST - 1
};
@@ -958,7 +955,6 @@
NL80211_RRF_DFS_CONCURRENT = 1 << 21,
NL80211_RRF_NO_6GHZ_VLP_CLIENT = 1 << 22,
NL80211_RRF_NO_6GHZ_AFC_CLIENT = 1 << 23,
- NL80211_RRF_ALLOW_6GHZ_VLP_AP = 1 << 24,
};
#define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR
#define NL80211_RRF_NO_IBSS NL80211_RRF_NO_IR
@@ -1977,19 +1973,4 @@
NL80211_AP_SETTINGS_EXTERNAL_AUTH_SUPPORT = 1 << 0,
NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1,
};
-enum nl80211_wiphy_radio_attrs {
- __NL80211_WIPHY_RADIO_ATTR_INVALID,
- NL80211_WIPHY_RADIO_ATTR_INDEX,
- NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE,
- NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION,
- __NL80211_WIPHY_RADIO_ATTR_LAST,
- NL80211_WIPHY_RADIO_ATTR_MAX = __NL80211_WIPHY_RADIO_ATTR_LAST - 1,
-};
-enum nl80211_wiphy_radio_freq_range {
- __NL80211_WIPHY_RADIO_FREQ_ATTR_INVALID,
- NL80211_WIPHY_RADIO_FREQ_ATTR_START,
- NL80211_WIPHY_RADIO_FREQ_ATTR_END,
- __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST,
- NL80211_WIPHY_RADIO_FREQ_ATTR_MAX = __NL80211_WIPHY_RADIO_FREQ_ATTR_LAST - 1,
-};
#endif
diff --git a/libc/kernel/uapi/linux/nsfs.h b/libc/kernel/uapi/linux/nsfs.h
index c8f2208..61a5797 100644
--- a/libc/kernel/uapi/linux/nsfs.h
+++ b/libc/kernel/uapi/linux/nsfs.h
@@ -7,15 +7,9 @@
#ifndef __LINUX_NSFS_H
#define __LINUX_NSFS_H
#include <linux/ioctl.h>
-#include <linux/types.h>
#define NSIO 0xb7
#define NS_GET_USERNS _IO(NSIO, 0x1)
#define NS_GET_PARENT _IO(NSIO, 0x2)
#define NS_GET_NSTYPE _IO(NSIO, 0x3)
#define NS_GET_OWNER_UID _IO(NSIO, 0x4)
-#define NS_GET_MNTNS_ID _IOR(NSIO, 0x5, __u64)
-#define NS_GET_PID_FROM_PIDNS _IOR(NSIO, 0x6, int)
-#define NS_GET_TGID_FROM_PIDNS _IOR(NSIO, 0x7, int)
-#define NS_GET_PID_IN_PIDNS _IOR(NSIO, 0x8, int)
-#define NS_GET_TGID_IN_PIDNS _IOR(NSIO, 0x9, int)
#endif
diff --git a/libc/kernel/uapi/linux/openvswitch.h b/libc/kernel/uapi/linux/openvswitch.h
index 98c8037..d45f4fa 100644
--- a/libc/kernel/uapi/linux/openvswitch.h
+++ b/libc/kernel/uapi/linux/openvswitch.h
@@ -429,13 +429,6 @@
__OVS_CHECK_PKT_LEN_ATTR_MAX,
};
#define OVS_CHECK_PKT_LEN_ATTR_MAX (__OVS_CHECK_PKT_LEN_ATTR_MAX - 1)
-#define OVS_PSAMPLE_COOKIE_MAX_SIZE 16
-enum ovs_psample_attr {
- OVS_PSAMPLE_ATTR_GROUP = 1,
- OVS_PSAMPLE_ATTR_COOKIE,
- __OVS_PSAMPLE_ATTR_MAX
-};
-#define OVS_PSAMPLE_ATTR_MAX (__OVS_PSAMPLE_ATTR_MAX - 1)
enum ovs_action_attr {
OVS_ACTION_ATTR_UNSPEC,
OVS_ACTION_ATTR_OUTPUT,
@@ -462,7 +455,6 @@
OVS_ACTION_ATTR_ADD_MPLS,
OVS_ACTION_ATTR_DEC_TTL,
OVS_ACTION_ATTR_DROP,
- OVS_ACTION_ATTR_PSAMPLE,
__OVS_ACTION_ATTR_MAX,
};
#define OVS_ACTION_ATTR_MAX (__OVS_ACTION_ATTR_MAX - 1)
diff --git a/libc/kernel/uapi/linux/perf_event.h b/libc/kernel/uapi/linux/perf_event.h
index ec9b856..16a1a2e 100644
--- a/libc/kernel/uapi/linux/perf_event.h
+++ b/libc/kernel/uapi/linux/perf_event.h
@@ -460,8 +460,6 @@
#define PERF_MEM_LVLNUM_L2 0x02
#define PERF_MEM_LVLNUM_L3 0x03
#define PERF_MEM_LVLNUM_L4 0x04
-#define PERF_MEM_LVLNUM_L2_MHB 0x05
-#define PERF_MEM_LVLNUM_MSC 0x06
#define PERF_MEM_LVLNUM_UNC 0x08
#define PERF_MEM_LVLNUM_CXL 0x09
#define PERF_MEM_LVLNUM_IO 0x0a
diff --git a/libc/kernel/uapi/linux/pidfd.h b/libc/kernel/uapi/linux/pidfd.h
index 9068727..082b4a0 100644
--- a/libc/kernel/uapi/linux/pidfd.h
+++ b/libc/kernel/uapi/linux/pidfd.h
@@ -8,21 +8,9 @@
#define _UAPI_LINUX_PIDFD_H
#include <linux/types.h>
#include <linux/fcntl.h>
-#include <linux/ioctl.h>
#define PIDFD_NONBLOCK O_NONBLOCK
#define PIDFD_THREAD O_EXCL
#define PIDFD_SIGNAL_THREAD (1UL << 0)
#define PIDFD_SIGNAL_THREAD_GROUP (1UL << 1)
#define PIDFD_SIGNAL_PROCESS_GROUP (1UL << 2)
-#define PIDFS_IOCTL_MAGIC 0xFF
-#define PIDFD_GET_CGROUP_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 1)
-#define PIDFD_GET_IPC_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 2)
-#define PIDFD_GET_MNT_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 3)
-#define PIDFD_GET_NET_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 4)
-#define PIDFD_GET_PID_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 5)
-#define PIDFD_GET_PID_FOR_CHILDREN_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 6)
-#define PIDFD_GET_TIME_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 7)
-#define PIDFD_GET_TIME_FOR_CHILDREN_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 8)
-#define PIDFD_GET_USER_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 9)
-#define PIDFD_GET_UTS_NAMESPACE _IO(PIDFS_IOCTL_MAGIC, 10)
#endif
diff --git a/libc/kernel/uapi/linux/pkt_cls.h b/libc/kernel/uapi/linux/pkt_cls.h
index bdca553..6b5143c 100644
--- a/libc/kernel/uapi/linux/pkt_cls.h
+++ b/libc/kernel/uapi/linux/pkt_cls.h
@@ -419,8 +419,6 @@
TCA_FLOWER_KEY_CFM,
TCA_FLOWER_KEY_SPI,
TCA_FLOWER_KEY_SPI_MASK,
- TCA_FLOWER_KEY_ENC_FLAGS,
- TCA_FLOWER_KEY_ENC_FLAGS_MASK,
__TCA_FLOWER_MAX,
};
#define TCA_FLOWER_MAX (__TCA_FLOWER_MAX - 1)
@@ -499,13 +497,7 @@
enum {
TCA_FLOWER_KEY_FLAGS_IS_FRAGMENT = (1 << 0),
TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
- TCA_FLOWER_KEY_FLAGS_TUNNEL_CSUM = (1 << 2),
- TCA_FLOWER_KEY_FLAGS_TUNNEL_DONT_FRAGMENT = (1 << 3),
- TCA_FLOWER_KEY_FLAGS_TUNNEL_OAM = (1 << 4),
- TCA_FLOWER_KEY_FLAGS_TUNNEL_CRIT_OPT = (1 << 5),
- __TCA_FLOWER_KEY_FLAGS_MAX,
};
-#define TCA_FLOWER_KEY_FLAGS_MAX (__TCA_FLOWER_KEY_FLAGS_MAX - 1)
enum {
TCA_FLOWER_KEY_CFM_OPT_UNSPEC,
TCA_FLOWER_KEY_CFM_MD_LEVEL,
diff --git a/libc/kernel/uapi/linux/psample.h b/libc/kernel/uapi/linux/psample.h
index f9f979c..c82e76e 100644
--- a/libc/kernel/uapi/linux/psample.h
+++ b/libc/kernel/uapi/linux/psample.h
@@ -22,8 +22,6 @@
PSAMPLE_ATTR_LATENCY,
PSAMPLE_ATTR_TIMESTAMP,
PSAMPLE_ATTR_PROTO,
- PSAMPLE_ATTR_USER_COOKIE,
- PSAMPLE_ATTR_SAMPLE_PROBABILITY,
__PSAMPLE_ATTR_MAX
};
enum psample_command {
diff --git a/libc/kernel/uapi/linux/psp-sev.h b/libc/kernel/uapi/linux/psp-sev.h
index 7274081..82fcbf1 100644
--- a/libc/kernel/uapi/linux/psp-sev.h
+++ b/libc/kernel/uapi/linux/psp-sev.h
@@ -20,7 +20,6 @@
SNP_PLATFORM_STATUS,
SNP_COMMIT,
SNP_SET_CONFIG,
- SNP_VLEK_LOAD,
SEV_MAX,
};
typedef enum {
@@ -29,7 +28,6 @@
SEV_RET_INVALID_PLATFORM_STATE,
SEV_RET_INVALID_GUEST_STATE,
SEV_RET_INAVLID_CONFIG,
- SEV_RET_INVALID_CONFIG = SEV_RET_INAVLID_CONFIG,
SEV_RET_INVALID_LEN,
SEV_RET_ALREADY_OWNED,
SEV_RET_INVALID_CERTIFICATE,
@@ -115,15 +113,6 @@
__u32 rsvd : 30;
__u8 rsvd1[52];
} __attribute__((__packed__));
-struct sev_user_data_snp_vlek_load {
- __u32 len;
- __u8 vlek_wrapped_version;
- __u8 rsvd[3];
- __u64 vlek_wrapped_address;
-} __attribute__((__packed__));
-struct sev_user_data_snp_wrapped_vlek_hashstick {
- __u8 data[432];
-} __attribute__((__packed__));
struct sev_issue_cmd {
__u32 cmd;
__u64 data;
diff --git a/libc/kernel/uapi/linux/random.h b/libc/kernel/uapi/linux/random.h
index 64f62d9..d1fd998 100644
--- a/libc/kernel/uapi/linux/random.h
+++ b/libc/kernel/uapi/linux/random.h
@@ -24,10 +24,4 @@
#define GRND_NONBLOCK 0x0001
#define GRND_RANDOM 0x0002
#define GRND_INSECURE 0x0004
-struct vgetrandom_opaque_params {
- __u32 size_of_opaque_state;
- __u32 mmap_prot;
- __u32 mmap_flags;
- __u32 reserved[13];
-};
#endif
diff --git a/libc/kernel/uapi/linux/sev-guest.h b/libc/kernel/uapi/linux/sev-guest.h
index a722641..a822bed 100644
--- a/libc/kernel/uapi/linux/sev-guest.h
+++ b/libc/kernel/uapi/linux/sev-guest.h
@@ -51,8 +51,6 @@
#define SNP_GUEST_FW_ERR_MASK GENMASK_ULL(31, 0)
#define SNP_GUEST_VMM_ERR_SHIFT 32
#define SNP_GUEST_VMM_ERR(x) (((u64) x) << SNP_GUEST_VMM_ERR_SHIFT)
-#define SNP_GUEST_FW_ERR(x) ((x) & SNP_GUEST_FW_ERR_MASK)
-#define SNP_GUEST_ERR(vmm_err,fw_err) (SNP_GUEST_VMM_ERR(vmm_err) | SNP_GUEST_FW_ERR(fw_err))
#define SNP_GUEST_VMM_ERR_INVALID_LEN 1
#define SNP_GUEST_VMM_ERR_BUSY 2
#endif
diff --git a/libc/kernel/uapi/linux/stat.h b/libc/kernel/uapi/linux/stat.h
index aae9ed4..ff98fd2 100644
--- a/libc/kernel/uapi/linux/stat.h
+++ b/libc/kernel/uapi/linux/stat.h
@@ -69,11 +69,7 @@
__u32 stx_dio_mem_align;
__u32 stx_dio_offset_align;
__u64 stx_subvol;
- __u32 stx_atomic_write_unit_min;
- __u32 stx_atomic_write_unit_max;
- __u32 stx_atomic_write_segments_max;
- __u32 __spare1[1];
- __u64 __spare3[9];
+ __u64 __spare3[11];
};
#define STATX_TYPE 0x00000001U
#define STATX_MODE 0x00000002U
@@ -92,7 +88,6 @@
#define STATX_DIOALIGN 0x00002000U
#define STATX_MNT_ID_UNIQUE 0x00004000U
#define STATX_SUBVOL 0x00008000U
-#define STATX_WRITE_ATOMIC 0x00010000U
#define STATX__RESERVED 0x80000000U
#define STATX_ALL 0x00000fffU
#define STATX_ATTR_COMPRESSED 0x00000004
@@ -104,5 +99,4 @@
#define STATX_ATTR_MOUNT_ROOT 0x00002000
#define STATX_ATTR_VERITY 0x00100000
#define STATX_ATTR_DAX 0x00200000
-#define STATX_ATTR_WRITE_ATOMIC 0x00400000
#endif
diff --git a/libc/kernel/uapi/linux/tcp_metrics.h b/libc/kernel/uapi/linux/tcp_metrics.h
index 46ca141..931f50c 100644
--- a/libc/kernel/uapi/linux/tcp_metrics.h
+++ b/libc/kernel/uapi/linux/tcp_metrics.h
@@ -4,8 +4,8 @@
* See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
* for more information.
*/
-#ifndef _UAPI_LINUX_TCP_METRICS_H
-#define _UAPI_LINUX_TCP_METRICS_H
+#ifndef _LINUX_TCP_METRICS_H
+#define _LINUX_TCP_METRICS_H
#include <linux/types.h>
#define TCP_METRICS_GENL_NAME "tcp_metrics"
#define TCP_METRICS_GENL_VERSION 0x1
@@ -21,17 +21,6 @@
};
#define TCP_METRIC_MAX (__TCP_METRIC_MAX - 1)
enum {
- TCP_METRICS_A_METRICS_RTT = 1,
- TCP_METRICS_A_METRICS_RTTVAR,
- TCP_METRICS_A_METRICS_SSTHRESH,
- TCP_METRICS_A_METRICS_CWND,
- TCP_METRICS_A_METRICS_REODERING,
- TCP_METRICS_A_METRICS_RTT_US,
- TCP_METRICS_A_METRICS_RTTVAR_US,
- __TCP_METRICS_A_METRICS_MAX
-};
-#define TCP_METRICS_A_METRICS_MAX (__TCP_METRICS_A_METRICS_MAX - 1)
-enum {
TCP_METRICS_ATTR_UNSPEC,
TCP_METRICS_ATTR_ADDR_IPV4,
TCP_METRICS_ATTR_ADDR_IPV6,
diff --git a/libc/kernel/uapi/linux/um_timetravel.h b/libc/kernel/uapi/linux/um_timetravel.h
index 49eeb28..8706017 100644
--- a/libc/kernel/uapi/linux/um_timetravel.h
+++ b/libc/kernel/uapi/linux/um_timetravel.h
@@ -12,15 +12,6 @@
__u32 seq;
__u64 time;
};
-#define UM_TIMETRAVEL_MAX_FDS 2
-enum um_timetravel_shared_mem_fds {
- UM_TIMETRAVEL_SHARED_MEMFD,
- UM_TIMETRAVEL_SHARED_LOGFD,
- UM_TIMETRAVEL_SHARED_MAX_FDS,
-};
-enum um_timetravel_start_ack {
- UM_TIMETRAVEL_START_ACK_ID = 0xffff,
-};
enum um_timetravel_ops {
UM_TIMETRAVEL_ACK = 0,
UM_TIMETRAVEL_START = 1,
@@ -31,36 +22,5 @@
UM_TIMETRAVEL_RUN = 6,
UM_TIMETRAVEL_FREE_UNTIL = 7,
UM_TIMETRAVEL_GET_TOD = 8,
- UM_TIMETRAVEL_BROADCAST = 9,
-};
-#define UM_TIMETRAVEL_SCHEDSHM_VERSION 2
-enum um_timetravel_schedshm_cap {
- UM_TIMETRAVEL_SCHEDSHM_CAP_TIME_SHARE = 0x1,
-};
-enum um_timetravel_schedshm_flags {
- UM_TIMETRAVEL_SCHEDSHM_FLAGS_REQ_RUN = 0x1,
-};
-union um_timetravel_schedshm_client {
- struct {
- __u32 capa;
- __u32 flags;
- __u64 req_time;
- __u64 name;
- };
- char reserve[128];
-};
-struct um_timetravel_schedshm {
- union {
- struct {
- __u32 version;
- __u32 len;
- __u64 free_until;
- __u64 current_time;
- __u16 running_id;
- __u16 max_clients;
- };
- char hdr[4096];
- };
- union um_timetravel_schedshm_client clients[];
};
#endif
diff --git a/libc/kernel/uapi/linux/v4l2-controls.h b/libc/kernel/uapi/linux/v4l2-controls.h
index f6ef26c..23158dc 100644
--- a/libc/kernel/uapi/linux/v4l2-controls.h
+++ b/libc/kernel/uapi/linux/v4l2-controls.h
@@ -714,7 +714,6 @@
V4L2_MPEG_VIDEO_AV1_LEVEL_7_2 = 22,
V4L2_MPEG_VIDEO_AV1_LEVEL_7_3 = 23
};
-#define V4L2_CID_MPEG_VIDEO_AVERAGE_QP (V4L2_CID_CODEC_BASE + 657)
#define V4L2_CID_CODEC_CX2341X_BASE (V4L2_CTRL_CLASS_CODEC | 0x1000)
#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE (V4L2_CID_CODEC_CX2341X_BASE + 0)
enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
diff --git a/libc/kernel/uapi/linux/version.h b/libc/kernel/uapi/linux/version.h
index 0cc45cf..7faa30f 100644
--- a/libc/kernel/uapi/linux/version.h
+++ b/libc/kernel/uapi/linux/version.h
@@ -4,8 +4,8 @@
* See https://android.googlesource.com/platform/bionic/+/master/libc/kernel/
* for more information.
*/
-#define LINUX_VERSION_CODE 396032
+#define LINUX_VERSION_CODE 395776
#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + ((c) > 255 ? 255 : (c)))
#define LINUX_VERSION_MAJOR 6
-#define LINUX_VERSION_PATCHLEVEL 11
+#define LINUX_VERSION_PATCHLEVEL 10
#define LINUX_VERSION_SUBLEVEL 0
diff --git a/libc/kernel/uapi/linux/videodev2.h b/libc/kernel/uapi/linux/videodev2.h
index fb69a8a..3905949 100644
--- a/libc/kernel/uapi/linux/videodev2.h
+++ b/libc/kernel/uapi/linux/videodev2.h
@@ -236,8 +236,6 @@
#define V4L2_PIX_FMT_RGBA1010102 v4l2_fourcc('R', 'A', '3', '0')
#define V4L2_PIX_FMT_ARGB2101010 v4l2_fourcc('A', 'R', '3', '0')
#define V4L2_PIX_FMT_BGR48_12 v4l2_fourcc('B', '3', '1', '2')
-#define V4L2_PIX_FMT_BGR48 v4l2_fourcc('B', 'G', 'R', '6')
-#define V4L2_PIX_FMT_RGB48 v4l2_fourcc('R', 'G', 'B', '6')
#define V4L2_PIX_FMT_ABGR64_12 v4l2_fourcc('B', '4', '1', '2')
#define V4L2_PIX_FMT_GREY v4l2_fourcc('G', 'R', 'E', 'Y')
#define V4L2_PIX_FMT_Y4 v4l2_fourcc('Y', '0', '4', ' ')
@@ -427,16 +425,6 @@
#define V4L2_PIX_FMT_IPU3_SGBRG10 v4l2_fourcc('i', 'p', '3', 'g')
#define V4L2_PIX_FMT_IPU3_SGRBG10 v4l2_fourcc('i', 'p', '3', 'G')
#define V4L2_PIX_FMT_IPU3_SRGGB10 v4l2_fourcc('i', 'p', '3', 'r')
-#define V4L2_PIX_FMT_PISP_COMP1_RGGB v4l2_fourcc('P', 'C', '1', 'R')
-#define V4L2_PIX_FMT_PISP_COMP1_GRBG v4l2_fourcc('P', 'C', '1', 'G')
-#define V4L2_PIX_FMT_PISP_COMP1_GBRG v4l2_fourcc('P', 'C', '1', 'g')
-#define V4L2_PIX_FMT_PISP_COMP1_BGGR v4l2_fourcc('P', 'C', '1', 'B')
-#define V4L2_PIX_FMT_PISP_COMP1_MONO v4l2_fourcc('P', 'C', '1', 'M')
-#define V4L2_PIX_FMT_PISP_COMP2_RGGB v4l2_fourcc('P', 'C', '2', 'R')
-#define V4L2_PIX_FMT_PISP_COMP2_GRBG v4l2_fourcc('P', 'C', '2', 'G')
-#define V4L2_PIX_FMT_PISP_COMP2_GBRG v4l2_fourcc('P', 'C', '2', 'g')
-#define V4L2_PIX_FMT_PISP_COMP2_BGGR v4l2_fourcc('P', 'C', '2', 'B')
-#define V4L2_PIX_FMT_PISP_COMP2_MONO v4l2_fourcc('P', 'C', '2', 'M')
#define V4L2_SDR_FMT_CU8 v4l2_fourcc('C', 'U', '0', '8')
#define V4L2_SDR_FMT_CU16LE v4l2_fourcc('C', 'U', '1', '6')
#define V4L2_SDR_FMT_CS8 v4l2_fourcc('C', 'S', '0', '8')
@@ -456,7 +444,6 @@
#define V4L2_META_FMT_VIVID v4l2_fourcc('V', 'I', 'V', 'D')
#define V4L2_META_FMT_RK_ISP1_PARAMS v4l2_fourcc('R', 'K', '1', 'P')
#define V4L2_META_FMT_RK_ISP1_STAT_3A v4l2_fourcc('R', 'K', '1', 'S')
-#define V4L2_META_FMT_RPI_BE_CFG v4l2_fourcc('R', 'P', 'B', 'C')
#define V4L2_PIX_FMT_PRIV_MAGIC 0xfeedcafe
#define V4L2_PIX_FMT_FLAG_PREMUL_ALPHA 0x00000001
#define V4L2_PIX_FMT_FLAG_SET_CSC 0x00000002
diff --git a/libc/kernel/uapi/linux/xfrm.h b/libc/kernel/uapi/linux/xfrm.h
index 9509efe..b8e79e8 100644
--- a/libc/kernel/uapi/linux/xfrm.h
+++ b/libc/kernel/uapi/linux/xfrm.h
@@ -260,7 +260,6 @@
XFRMA_IF_ID,
XFRMA_MTIMER_THRESH,
XFRMA_SA_DIR,
- XFRMA_NAT_KEEPALIVE_INTERVAL,
__XFRMA_MAX
#define XFRMA_OUTPUT_MARK XFRMA_SET_MARK
#define XFRMA_MAX (__XFRMA_MAX - 1)
diff --git a/libc/kernel/uapi/linux/zorro_ids.h b/libc/kernel/uapi/linux/zorro_ids.h
index 05239cd..f47c899 100644
--- a/libc/kernel/uapi/linux/zorro_ids.h
+++ b/libc/kernel/uapi/linux/zorro_ids.h
@@ -354,8 +354,6 @@
#define ZORRO_MANUF_VMC 0x1389
#define ZORRO_PROD_VMC_ISDN_BLASTER_Z2 ZORRO_ID(VMC, 0x01, 0)
#define ZORRO_PROD_VMC_HYPERCOM_4 ZORRO_ID(VMC, 0x02, 0)
-#define ZORRO_MANUF_CSLAB 0x1400
-#define ZORRO_PROD_CSLAB_WARP_1260 ZORRO_ID(CSLAB, 0x65, 0)
#define ZORRO_MANUF_INFORMATION 0x157C
#define ZORRO_PROD_INFORMATION_ISDN_ENGINE_I ZORRO_ID(INFORMATION, 0x64, 0)
#define ZORRO_MANUF_VORTEX 0x2017