History

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Ingo Molnar committed 6 years ago

Commit c494cd62 parents 8cacac6 c4b7547195 files · +3382 −4088Browse files

Showing the changes to include/uapi/linux (2 of 195 files). Show all

Unified · Split

2 files
  1. include/uapi/linux/devlink.h +1 −0
  2. include/uapi/linux/ptp_clock.h +4 −1
include/uapi/linux/devlink.h+1−0
@@ -421,6 +421,7 @@ enum devlink_attr { · 420 unmodified lines
421 421
422 DEVLINK_ATTR_RELOAD_FAILED, /* u8 0 or 1 */422 DEVLINK_ATTR_RELOAD_FAILED, /* u8 0 or 1 */
423 423
424 DEVLINK_ATTR_HEALTH_REPORTER_DUMP_TS_NS, /* u64 */
424 /* add new attributes above here, update the policy in devlink.c */425 /* add new attributes above here, update the policy in devlink.c */
425 426
426 __DEVLINK_ATTR_MAX,427 __DEVLINK_ATTR_MAX,
include/uapi/linux/ptp_clock.h+4−1
@@ -31,13 +31,16 @@ · 30 unmodified lines
31#define PTP_ENABLE_FEATURE (1<<0)31#define PTP_ENABLE_FEATURE (1<<0)
32#define PTP_RISING_EDGE (1<<1)32#define PTP_RISING_EDGE (1<<1)
33#define PTP_FALLING_EDGE (1<<2)33#define PTP_FALLING_EDGE (1<<2)
34#define PTP_STRICT_FLAGS (1<<3)
35#define PTP_EXTTS_EDGES (PTP_RISING_EDGE | PTP_FALLING_EDGE)
34 36
35/*37/*
36 * flag fields valid for the new PTP_EXTTS_REQUEST2 ioctl.38 * flag fields valid for the new PTP_EXTTS_REQUEST2 ioctl.
37 */39 */
38#define PTP_EXTTS_VALID_FLAGS (PTP_ENABLE_FEATURE | \40#define PTP_EXTTS_VALID_FLAGS (PTP_ENABLE_FEATURE | \
39 PTP_RISING_EDGE | \41 PTP_RISING_EDGE | \
40 PTP_FALLING_EDGE)42 PTP_FALLING_EDGE | \
43 PTP_STRICT_FLAGS)
41 44
42/*45/*
43 * flag fields valid for the original PTP_EXTTS_REQUEST ioctl.46 * flag fields valid for the original PTP_EXTTS_REQUEST ioctl.