Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch

Thomas Gleixner committed 8 years ago

Commit 604a98f2 parents 1cfd904 7dba33c674 files · +8472 −4792Browse files

Showing the changes to include/uapi/linux (6 of 674 files). Show all

Unified · Split

6 files

@@ -676,6 +676,13 @@ struct kvm_ioeventfd { · 675 unmodified lines
676	676	__u8 pad[36];
677	677	};
678	678
	679	+#define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0)
	680	+#define KVM_X86_DISABLE_EXITS_HTL (1 << 1)
	681	+#define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2)
	682	+#define KVM_X86_DISABLE_VALID_EXITS (KVM_X86_DISABLE_EXITS_MWAIT \| \
	683	+ KVM_X86_DISABLE_EXITS_HTL \| \
	684	+ KVM_X86_DISABLE_EXITS_PAUSE)
	685	+
679	686	/* for KVM_ENABLE_CAP */
680	687	struct kvm_enable_cap {
681	688	/* in */

@@ -650,11 +650,23 @@ struct perf_event_mmap_page { · 649 unmodified lines
650	650	#define PERF_RECORD_MISC_COMM_EXEC (1 << 13)
651	651	#define PERF_RECORD_MISC_SWITCH_OUT (1 << 13)
652	652	/*
653		− * Indicates that the content of PERF_SAMPLE_IP points to
654		− * the actual instruction that triggered the event. See also
655		− * perf_event_attr::precise_ip.
	653	+ * These PERF_RECORD_MISC_* flags below are safely reused
	654	+ * for the following events:
	655	+ *
	656	+ * PERF_RECORD_MISC_EXACT_IP - PERF_RECORD_SAMPLE of precise events
	657	+ * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT - PERF_RECORD_SWITCH* events
	658	+ *
	659	+ *
	660	+ * PERF_RECORD_MISC_EXACT_IP:
	661	+ * Indicates that the content of PERF_SAMPLE_IP points to
	662	+ * the actual instruction that triggered the event. See also
	663	+ * perf_event_attr::precise_ip.
	664	+ *
	665	+ * PERF_RECORD_MISC_SWITCH_OUT_PREEMPT:
	666	+ * Indicates that thread was preempted in TASK_RUNNING state.
656	667	*/
657	668	#define PERF_RECORD_MISC_EXACT_IP (1 << 14)
	669	+#define PERF_RECORD_MISC_SWITCH_OUT_PREEMPT (1 << 14)
658	670	/*
659	671	* Reserve the last bit to indicate some extended misc field
660	672	*/

@@ -35,6 +35,9 @@ · 34 unmodified lines
35	35	/* Clear the entropy pool and associated counters. (Superuser only.) */
36	36	#define RNDCLEARPOOL _IO( 'R', 0x06 )
37	37
	38	+/* Reseed CRNG. (Superuser only.) */
	39	+#define RNDRESEEDCRNG _IO( 'R', 0x07 )
	40	+
38	41	struct rand_pool_info {
39	42	int entropy_count;
40	43	int buf_size;

@@ -780,24 +780,6 @@ enum { · 779 unmodified lines
780	780	NET_BRIDGE_NF_FILTER_PPPOE_TAGGED = 5,
781	781	};
782	782
783		−/* proc/sys/net/irda */
784		−enum {
785		− NET_IRDA_DISCOVERY=1,
786		− NET_IRDA_DEVNAME=2,
787		− NET_IRDA_DEBUG=3,
788		− NET_IRDA_FAST_POLL=4,
789		− NET_IRDA_DISCOVERY_SLOTS=5,
790		− NET_IRDA_DISCOVERY_TIMEOUT=6,
791		− NET_IRDA_SLOT_TIMEOUT=7,
792		− NET_IRDA_MAX_BAUD_RATE=8,
793		− NET_IRDA_MIN_TX_TURN_TIME=9,
794		− NET_IRDA_MAX_TX_DATA_SIZE=10,
795		− NET_IRDA_MAX_TX_WINDOW=11,
796		− NET_IRDA_MAX_NOREPLY_TIME=12,
797		− NET_IRDA_WARN_NOREPLY_TIME=13,
798		− NET_IRDA_LAP_KEEPALIVE_TIME=14,
799		−};
800		−
801	783
802	784	/* CTL_FS names: */
803	785	enum

@@ -80,7 +80,6 @@ struct __kernel_old_timeval { · 79 unmodified lines
80	80	*/
81	81	#define CLOCK_SGI_CYCLE 10
82	82	#define CLOCK_TAI 11
83		−#define CLOCK_MONOTONIC_ACTIVE 12
84	83
85	84	#define MAX_CLOCKS 16
86	85	#define CLOCKS_MASK (CLOCK_REALTIME \| CLOCK_MONOTONIC)

@@ -57,6 +57,21 @@ struct virtio_balloon_config { · 56 unmodified lines
57	57	#define VIRTIO_BALLOON_S_HTLB_PGFAIL 9 /* Hugetlb page allocation failures */
58	58	#define VIRTIO_BALLOON_S_NR 10
59	59
	60	+#define VIRTIO_BALLOON_S_NAMES_WITH_PREFIX(VIRTIO_BALLOON_S_NAMES_prefix) { \
	61	+ VIRTIO_BALLOON_S_NAMES_prefix "swap-in", \
	62	+ VIRTIO_BALLOON_S_NAMES_prefix "swap-out", \
	63	+ VIRTIO_BALLOON_S_NAMES_prefix "major-faults", \
	64	+ VIRTIO_BALLOON_S_NAMES_prefix "minor-faults", \
	65	+ VIRTIO_BALLOON_S_NAMES_prefix "free-memory", \
	66	+ VIRTIO_BALLOON_S_NAMES_prefix "total-memory", \
	67	+ VIRTIO_BALLOON_S_NAMES_prefix "available-memory", \
	68	+ VIRTIO_BALLOON_S_NAMES_prefix "disk-caches", \
	69	+ VIRTIO_BALLOON_S_NAMES_prefix "hugetlb-allocations", \
	70	+ VIRTIO_BALLOON_S_NAMES_prefix "hugetlb-failures" \
	71	+}
	72	+
	73	+#define VIRTIO_BALLOON_S_NAMES VIRTIO_BALLOON_S_NAMES_WITH_PREFIX("")
	74	+
60	75	/*
61	76	* Memory statistics structure.
62	77	* Driver fills an array of these structures and passes to device.