Merge 5.6-rc7 into char-misc-next

We need the char/misc driver fixes in here as well.

Greg Kroah-Hartman committed 6 years ago

Commit baca54d2 parents 217fb36 16fbf79414 files · +3487 −1503Browse files

Showing the changes to include/linux (17 of 414 files). Show all

Unified · Split

17 files

include/linux/cgroup.h +1 −0
include/linux/dmar.h +9 −5
include/linux/file.h +1 −0
include/linux/fs.h +1 −0
include/linux/futex.h +10 −7
include/linux/genhd.h +1 −12
include/linux/inet_diag.h +12 −6
include/linux/intel-iommu.h +2 −0
include/linux/mmc/host.h +1 −0
include/linux/of_clk.h +4 −4
include/linux/page-flags.h +1 −1
include/linux/phy.h +3 −0
include/linux/platform_device.h +1 −1
include/linux/rhashtable.h +1 −1
include/linux/socket.h +2 −1
include/linux/vmalloc.h +3 −2
include/linux/workqueue.h +16 −0

@@ -62,6 +62,7 @@ struct css_task_iter { · 61 unmodified lines
62	62	struct list_head *mg_tasks_head;
63	63	struct list_head *dying_tasks_head;
64	64
	65	+ struct list_head *cur_tasks_head;
65	66	struct css_set *cur_cset;
66	67	struct css_set *cur_dcset;
67	68	struct task_struct *cur_task;

include/linux/dmar.h+9−5

@@ -69,19 +69,23 @@ struct dmar_pci_notify_info { · 68 unmodified lines
69	69	extern struct rw_semaphore dmar_global_lock;
70	70	extern struct list_head dmar_drhd_units;
71	71
72		−#define for_each_drhd_unit(drhd) \
73		− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list)
	72	+#define for_each_drhd_unit(drhd) \
	73	+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
	74	+ dmar_rcu_check())
74	75
75	76	#define for_each_active_drhd_unit(drhd) \
76		− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
	77	+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
	78	+ dmar_rcu_check()) \
77	79	if (drhd->ignored) {} else
78	80
79	81	#define for_each_active_iommu(i, drhd) \
80		− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
	82	+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
	83	+ dmar_rcu_check()) \
81	84	if (i=drhd->iommu, drhd->ignored) {} else
82	85
83	86	#define for_each_iommu(i, drhd) \
84		− list_for_each_entry_rcu(drhd, &dmar_drhd_units, list) \
	87	+ list_for_each_entry_rcu(drhd, &dmar_drhd_units, list, \
	88	+ dmar_rcu_check()) \
85	89	if (i=drhd->iommu, 0) {} else
86	90
87	91	static inline bool dmar_rcu_check(void)

include/linux/file.h+1−0

@@ -85,6 +85,7 @@ extern int f_dupfd(unsigned int from, struct file *file, unsigned flags); · 84 unmodified lines
85	85	extern int replace_fd(unsigned fd, struct file *file, unsigned flags);
86	86	extern void set_close_on_exec(unsigned int fd, int flag);
87	87	extern bool get_close_on_exec(unsigned int fd);
	88	+extern int __get_unused_fd_flags(unsigned flags, unsigned long nofile);
88	89	extern int get_unused_fd_flags(unsigned flags);
89	90	extern void put_unused_fd(unsigned int fd);
90	91

include/linux/fs.h+1−0

@@ -698,6 +698,7 @@ struct inode { · 697 unmodified lines
698	698	struct rcu_head i_rcu;
699	699	};
700	700	atomic64_t i_version;
	701	+ atomic64_t i_sequence; /* see futex */
701	702	atomic_t i_count;
702	703	atomic_t i_dio_count;
703	704	atomic_t i_writecount;

include/linux/futex.h+10−7

@@ -31,23 +31,26 @@ struct task_struct; · 30 unmodified lines
31	31
32	32	union futex_key {
33	33	struct {
	34	+ u64 i_seq;
34	35	unsigned long pgoff;
35		− struct inode *inode;
36		− int offset;
	36	+ unsigned int offset;
37	37	} shared;
38	38	struct {
	39	+ union {
	40	+ struct mm_struct *mm;
	41	+ u64 __tmp;
	42	+ };
39	43	unsigned long address;
40		− struct mm_struct *mm;
41		− int offset;
	44	+ unsigned int offset;
42	45	} private;
43	46	struct {
	47	+ u64 ptr;
44	48	unsigned long word;
45		− void *ptr;
46		− int offset;
	49	+ unsigned int offset;
47	50	} both;
48	51	};
49	52
50		−#define FUTEX_KEY_INIT (union futex_key) { .both = { .ptr = NULL } }
	53	+#define FUTEX_KEY_INIT (union futex_key) { .both = { .ptr = 0ULL } }
51	54
52	55	#ifdef CONFIG_FUTEX
53	56	enum {

include/linux/genhd.h+1−12

@@ -245,18 +245,6 @@ static inline bool disk_part_scan_enabled(struct gendisk *disk) · 244 unmodified lines
245	245	!(disk->flags & GENHD_FL_NO_PART_SCAN);
246	246	}
247	247
248		−static inline bool disk_has_partitions(struct gendisk *disk)
249		−{
250		− bool ret = false;
251		−
252		− rcu_read_lock();
253		− if (rcu_dereference(disk->part_tbl)->len > 1)
254		− ret = true;
255		− rcu_read_unlock();
256		−
257		− return ret;
258		−}
259		−
260	248	static inline dev_t disk_devt(struct gendisk *disk)
261	249	{
262	250	return MKDEV(disk->major, disk->first_minor);
@@ -298,6 +286,7 @@ extern void disk_part_iter_exit(struct disk_part_iter *piter); · 35 unmodified lines
298	286
299	287	extern struct hd_struct disk_map_sector_rcu(struct gendisk disk,
300	288	sector_t sector);
	289	+bool disk_has_partitions(struct gendisk *disk);
301	290
302	291	/*
303	292	* Macros to operate on percpu disk statistics:

include/linux/inet_diag.h+12−6

@@ -2,15 +2,10 @@ · 1 unmodified line
2	2	#ifndef _INET_DIAG_H_
3	3	#define _INET_DIAG_H_ 1
4	4
	5	+#include <net/netlink.h>
5	6	#include <uapi/linux/inet_diag.h>
6	7
7		−struct net;
8		−struct sock;
9	8	struct inet_hashinfo;
10		−struct nlattr;
11		−struct nlmsghdr;
12		−struct sk_buff;
13		−struct netlink_callback;
14	9
15	10	struct inet_diag_handler {
16	11	void (dump)(struct sk_buff skb,
@@ -62,6 +57,17 @@ int inet_diag_bc_sk(const struct nlattr _bc, struct sock sk); · 45 unmodified lines
62	57
63	58	void inet_diag_msg_common_fill(struct inet_diag_msg r, struct sock sk);
64	59
	60	+static inline size_t inet_diag_msg_attrs_size(void)
	61	+{
	62	+ return nla_total_size(1) /* INET_DIAG_SHUTDOWN */
	63	+ + nla_total_size(1) /* INET_DIAG_TOS */
	64	+#if IS_ENABLED(CONFIG_IPV6)
	65	+ + nla_total_size(1) /* INET_DIAG_TCLASS */
	66	+ + nla_total_size(1) /* INET_DIAG_SKV6ONLY */
	67	+#endif
	68	+ + nla_total_size(4) /* INET_DIAG_MARK */
	69	+ + nla_total_size(4); /* INET_DIAG_CLASS_ID */
	70	+}
65	71	int inet_diag_msg_attrs_fill(struct sock sk, struct sk_buff skb,
66	72	struct inet_diag_msg *r, int ext,
67	73	struct user_namespace *user_ns, bool net_admin);

include/linux/intel-iommu.h+2−0

@@ -123,6 +123,8 @@ · 122 unmodified lines
123	123
124	124	#define dmar_readq(a) readq(a)
125	125	#define dmar_writeq(a,v) writeq(v,a)
	126	+#define dmar_readl(a) readl(a)
	127	+#define dmar_writel(a, v) writel(v, a)
126	128
127	129	#define DMAR_VER_MAJOR(v) (((v) & 0xf0) >> 4)
128	130	#define DMAR_VER_MINOR(v) ((v) & 0x0f)

include/linux/mmc/host.h+1−0

@@ -333,6 +333,7 @@ struct mmc_host { · 332 unmodified lines
333	333	MMC_CAP_UHS_SDR50 \| MMC_CAP_UHS_SDR104 \| \
334	334	MMC_CAP_UHS_DDR50)
335	335	#define MMC_CAP_SYNC_RUNTIME_PM (1 << 21) /* Synced runtime PM suspends. */
	336	+#define MMC_CAP_NEED_RSP_BUSY (1 << 22) /* Commands with R1B can't use R1. */
336	337	#define MMC_CAP_DRIVER_TYPE_A (1 << 23) /* Host supports Driver Type A */
337	338	#define MMC_CAP_DRIVER_TYPE_C (1 << 24) /* Host supports Driver Type C */
338	339	#define MMC_CAP_DRIVER_TYPE_D (1 << 25) /* Host supports Driver Type D */

include/linux/of_clk.h+4−4

@@ -11,17 +11,17 @@ struct of_device_id; · 10 unmodified lines
11	11
12	12	#if defined(CONFIG_COMMON_CLK) && defined(CONFIG_OF)
13	13
14		−unsigned int of_clk_get_parent_count(struct device_node *np);
15		−const char of_clk_get_parent_name(struct device_node np, int index);
	14	+unsigned int of_clk_get_parent_count(const struct device_node *np);
	15	+const char of_clk_get_parent_name(const struct device_node np, int index);
16	16	void of_clk_init(const struct of_device_id *matches);
17	17
18	18	#else /* !CONFIG_COMMON_CLK \|\| !CONFIG_OF */
19	19
20		−static inline unsigned int of_clk_get_parent_count(struct device_node *np)
	20	+static inline unsigned int of_clk_get_parent_count(const struct device_node *np)
21	21	{
22	22	return 0;
23	23	}
24		−static inline const char of_clk_get_parent_name(struct device_node np,
	24	+static inline const char of_clk_get_parent_name(const struct device_node np,
25	25	int index)
26	26	{
27	27	return NULL;

include/linux/page-flags.h+1−1

@@ -311,7 +311,7 @@ static inline int TestClearPage##uname(struct page *page) { return 0; } · 310 unmodified lines
311	311
312	312	__PAGEFLAG(Locked, locked, PF_NO_TAIL)
313	313	PAGEFLAG(Waiters, waiters, PF_ONLY_HEAD) __CLEARPAGEFLAG(Waiters, waiters, PF_ONLY_HEAD)
314		−PAGEFLAG(Error, error, PF_NO_COMPOUND) TESTCLEARFLAG(Error, error, PF_NO_COMPOUND)
	314	+PAGEFLAG(Error, error, PF_NO_TAIL) TESTCLEARFLAG(Error, error, PF_NO_TAIL)
315	315	PAGEFLAG(Referenced, referenced, PF_HEAD)
316	316	TESTCLEARFLAG(Referenced, referenced, PF_HEAD)
317	317	__SETPAGEFLAG(Referenced, referenced, PF_HEAD)

include/linux/phy.h+3−0

@@ -357,6 +357,7 @@ struct macsec_ops; · 356 unmodified lines
357	357	* is_gigabit_capable: Set to true if PHY supports 1000Mbps
358	358	* has_fixups: Set to true if this phy has fixups/quirks.
359	359	* suspended: Set to true if this phy has been suspended successfully.
	360	+ * suspended_by_mdio_bus: Set to true if this phy was suspended by MDIO bus.
360	361	* sysfs_links: Internal boolean tracking sysfs symbolic links setup/removal.
361	362	* loopback_enabled: Set true if this phy has been loopbacked successfully.
362	363	* state: state of the PHY for management purposes
@@ -396,6 +397,7 @@ struct phy_device { · 33 unmodified lines
396	397	unsigned is_gigabit_capable:1;
397	398	unsigned has_fixups:1;
398	399	unsigned suspended:1;
	400	+ unsigned suspended_by_mdio_bus:1;
399	401	unsigned sysfs_links:1;
400	402	unsigned loopback_enabled:1;
401	403
@@ -557,6 +559,7 @@ struct phy_driver { · 155 unmodified lines
557	559	/*
558	560	* Checks if the PHY generated an interrupt.
559	561	* For multi-PHY devices with shared PHY interrupt pin
	562	+ * Set interrupt bits have to be cleared.
560	563	*/
561	564	int (did_interrupt)(struct phy_device phydev);
562	565

include/linux/platform_device.h+1−1

@@ -24,7 +24,7 @@ struct platform_device { · 23 unmodified lines
24	24	int id;
25	25	bool id_auto;
26	26	struct device dev;
27		− u64 dma_mask;
	27	+ u64 platform_dma_mask;
28	28	u32 num_resources;
29	29	struct resource *resource;
30	30

include/linux/rhashtable.h+1−1

@@ -972,9 +972,9 @@ static inline int rhashtable_lookup_insert_key( · 971 unmodified lines
972	972	/**
973	973	* rhashtable_lookup_get_insert_key - lookup and insert object into hash table
974	974	* @ht: hash table
	975	+ * @key: key
975	976	* @obj: pointer to hash head inside object
976	977	* @params: hash table parameters
977		− * @data: pointer to element data already in hashes
978	978	*
979	979	* Just like rhashtable_lookup_insert_key(), but this function returns the
980	980	* object if it exists, NULL if it does not and the insertion was successful,

include/linux/socket.h+2−1

@@ -401,7 +401,8 @@ extern int __sys_sendto(int fd, void __user *buff, size_t len, · 400 unmodified lines
401	401	int addr_len);
402	402	extern int __sys_accept4_file(struct file *file, unsigned file_flags,
403	403	struct sockaddr __user *upeer_sockaddr,
404		− int __user *upeer_addrlen, int flags);
	404	+ int __user *upeer_addrlen, int flags,
	405	+ unsigned long nofile);
405	406	extern int __sys_accept4(int fd, struct sockaddr __user *upeer_sockaddr,
406	407	int __user *upeer_addrlen, int flags);
407	408	extern int __sys_socket(int family, int type, int protocol);

include/linux/vmalloc.h+3−2

@@ -141,8 +141,9 @@ extern int remap_vmalloc_range_partial(struct vm_area_struct *vma, · 140 unmodified lines
141	141
142	142	extern int remap_vmalloc_range(struct vm_area_struct vma, void addr,
143	143	unsigned long pgoff);
144		−void vmalloc_sync_all(void);
145		−
	144	+void vmalloc_sync_mappings(void);
	145	+void vmalloc_sync_unmappings(void);
	146	+
146	147	/*
147	148	* Lowlevel-APIs (not for driver use!)
148	149	*/

include/linux/workqueue.h+16−0

@@ -487,6 +487,19 @@ extern void wq_worker_comm(char buf, size_t size, struct task_struct task); · 486 unmodified lines
487	487	*
488	488	* We queue the work to the CPU on which it was submitted, but if the CPU dies
489	489	* it can be processed by another CPU.
	490	+ *
	491	+ * Memory-ordering properties: If it returns %true, guarantees that all stores
	492	+ * preceding the call to queue_work() in the program order will be visible from
	493	+ * the CPU which will execute @work by the time such work executes, e.g.,
	494	+ *
	495	+ * { x is initially 0 }
	496	+ *
	497	+ * CPU0 CPU1
	498	+ *
	499	+ * WRITE_ONCE(x, 1); [ @work is being executed ]
	500	+ * r0 = queue_work(wq, work); r1 = READ_ONCE(x);
	501	+ *
	502	+ * Forbids: r0 == true && r1 == 0
490	503	*/
491	504	static inline bool queue_work(struct workqueue_struct *wq,
492	505	struct work_struct *work)
@@ -546,6 +559,9 @@ static inline bool schedule_work_on(int cpu, struct work_struct *work) · 53 unmodified lines
546	559	* This puts a job in the kernel-global workqueue if it was not already
547	560	* queued and leaves it in the same position on the kernel-global
548	561	* workqueue otherwise.
	562	+ *
	563	+ * Shares the same memory-ordering properties of queue_work(), cf. the
	564	+ * DocBook header of queue_work().
549	565	*/
550	566	static inline bool schedule_work(struct work_struct *work)
551	567	{