History

Merge branch 'perf/vlbr'

Peter Zijlstra committed 6 years ago

Commit 78c21412 parents bb42b3d e1ad1ac1067 files · +9632 −5649Browse files

Showing the changes to include/uapi/linux (9 of 1067 files). Show all

Unified · Split

9 files
  1. include/uapi/linux/bpf.h +1 −1
  2. include/uapi/linux/fb.h +1 −0
  3. include/uapi/linux/fs.h +1 −0
  4. include/uapi/linux/mrp_bridge.h +0 −1
  5. include/uapi/linux/ndctl.h +1 −0
  6. include/uapi/linux/rds.h +3 −1
  7. include/uapi/linux/spi/spidev.h +4 −0
  8. include/uapi/linux/vfio.h +1 −1
  9. include/uapi/linux/xattr.h +4 −0
include/uapi/linux/bpf.h+1−1
@@ -3168,7 +3168,7 @@ union bpf_attr { · 3167 unmodified lines
31683168 * Return
31693169 * The id is returned or 0 in case the id could not be retrieved.
31703170 *
3171− * void *bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
3171+ * int bpf_ringbuf_output(void *ringbuf, void *data, u64 size, u64 flags)
31723172 * Description
31733173 * Copy *size* bytes from *data* into a ring buffer *ringbuf*.
31743174 * If BPF_RB_NO_WAKEUP is specified in *flags*, no notification of
include/uapi/linux/fb.h+1−0
@@ -205,6 +205,7 @@ struct fb_bitfield { · 204 unmodified lines
205205 #define FB_ACTIVATE_ALL 64 /* change all VCs on this fb */
206206 #define FB_ACTIVATE_FORCE 128 /* force apply even when no change*/
207207 #define FB_ACTIVATE_INV_MODE 256 /* invalidate videomode */
208+#define FB_ACTIVATE_KD_TEXT 512 /* for KDSET vt ioctl */
208209
209210 #define FB_ACCELF_TEXT 1 /* (OBSOLETE) see fb_info.flags and vc_mode */
210211
include/uapi/linux/fs.h+1−0
@@ -262,6 +262,7 @@ struct fsxattr { · 261 unmodified lines
262262 #define FS_EA_INODE_FL 0x00200000 /* Inode used for large EA */
263263 #define FS_EOFBLOCKS_FL 0x00400000 /* Reserved for ext4 */
264264 #define FS_NOCOW_FL 0x00800000 /* Do not cow file */
265+#define FS_DAX_FL 0x02000000 /* Inode is DAX */
265266 #define FS_INLINE_DATA_FL 0x10000000 /* Reserved for ext4 */
266267 #define FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */
267268 #define FS_CASEFOLD_FL 0x40000000 /* Folder is case insensitive */
include/uapi/linux/mrp_bridge.h+0−1
@@ -36,7 +36,6 @@ enum br_mrp_port_state_type { · 35 unmodified lines
3636 enum br_mrp_port_role_type {
3737 BR_MRP_PORT_ROLE_PRIMARY,
3838 BR_MRP_PORT_ROLE_SECONDARY,
39− BR_MRP_PORT_ROLE_NONE,
4039 };
4140
4241 enum br_mrp_tlv_header_type {
include/uapi/linux/ndctl.h+1−0
@@ -244,6 +244,7 @@ struct nd_cmd_pkg { · 243 unmodified lines
244244 #define NVDIMM_FAMILY_HPE2 2
245245 #define NVDIMM_FAMILY_MSFT 3
246246 #define NVDIMM_FAMILY_HYPERV 4
247+#define NVDIMM_FAMILY_PAPR 5
247248
248249 #define ND_IOCTL_CALL _IOWR(ND_IOCTL, ND_CMD_CALL,\
249250 struct nd_cmd_pkg)
include/uapi/linux/rds.h+3−1
@@ -64,10 +64,12 @@ · 63 unmodified lines
6464
6565 /* supported values for SO_RDS_TRANSPORT */
6666 #define RDS_TRANS_IB 0
67−#define RDS_TRANS_IWARP 1
67+#define RDS_TRANS_GAP 1
6868 #define RDS_TRANS_TCP 2
6969 #define RDS_TRANS_COUNT 3
7070 #define RDS_TRANS_NONE (~0)
71+/* don't use RDS_TRANS_IWARP - it is deprecated */
72+#define RDS_TRANS_IWARP RDS_TRANS_GAP
7173
7274 /* IOCTLS commands for SOL_RDS */
7375 #define SIOCRDSSETTOS (SIOCPROTOPRIVATE)
include/uapi/linux/spi/spidev.h+4−0
@@ -48,6 +48,10 @@ · 47 unmodified lines
4848 #define SPI_TX_QUAD 0x200
4949 #define SPI_RX_DUAL 0x400
5050 #define SPI_RX_QUAD 0x800
51+#define SPI_CS_WORD 0x1000
52+#define SPI_TX_OCTAL 0x2000
53+#define SPI_RX_OCTAL 0x4000
54+#define SPI_3WIRE_HIZ 0x8000
5155
5256 /*---------------------------------------------------------------------------*/
5357
include/uapi/linux/vfio.h+1−1
@@ -1030,7 +1030,7 @@ struct vfio_iommu_type1_info_cap_iova_range { · 1029 unmodified lines
10301030 * size in bytes that can be used by user applications when getting the dirty
10311031 * bitmap.
10321032 */
1033−#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 1
1033+#define VFIO_IOMMU_TYPE1_INFO_CAP_MIGRATION 2
10341034
10351035 struct vfio_iommu_type1_info_cap_migration {
10361036 struct vfio_info_cap_header header;
include/uapi/linux/xattr.h+4−0
@@ -7,6 +7,7 @@ · 6 unmodified lines
77 Copyright (C) 2001 by Andreas Gruenbacher <a.gruenbacher@computer.org>
88 Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved.
99 Copyright (c) 2004 Red Hat, Inc., James Morris <jmorris@redhat.com>
10+ Copyright (c) 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
1011 */
1112
1213 #include <linux/libc-compat.h>
@@ -31,6 +32,9 @@ · 18 unmodified lines
3132 #define XATTR_BTRFS_PREFIX "btrfs."
3233 #define XATTR_BTRFS_PREFIX_LEN (sizeof(XATTR_BTRFS_PREFIX) - 1)
3334
35+#define XATTR_HURD_PREFIX "gnu."
36+#define XATTR_HURD_PREFIX_LEN (sizeof(XATTR_HURD_PREFIX) - 1)
37+
3438 #define XATTR_SECURITY_PREFIX "security."
3539 #define XATTR_SECURITY_PREFIX_LEN (sizeof(XATTR_SECURITY_PREFIX) - 1)
3640