History

Merge branch 'i2c/for-current-fixed' into i2c/for-5.8

Wolfram Sang committed 6 years ago

Commit f89c3262 parents 6fe12cd efa7fb4915 files · +9363 −5274Browse files

Showing the changes to include/linux (47 of 915 files). Show all

Unified · Split

47 files
  1. include/linux/backing-dev-defs.h +0 −1
  2. include/linux/bio.h +1 −1
  3. include/linux/blk-mq.h +1 −1
  4. include/linux/blk_types.h +1 −1
  5. include/linux/buffer_head.h +8 −0
  6. include/linux/can/dev/peak_canfd.h +2 −2
  7. include/linux/cpu_rmap.h +1 −1
  8. include/linux/debugfs.h +4 −8
  9. include/linux/digsig.h +2 −2
  10. include/linux/dirent.h +1 −1
  11. include/linux/dma-buf.h +1 −2
  12. include/linux/dmaengine.h +6 −6
  13. include/linux/enclosure.h +1 −1
  14. include/linux/energy_model.h +1 −1
  15. include/linux/ethtool.h +2 −2
  16. include/linux/genalloc.h +1 −1
  17. include/linux/i2c-mux.h +1 −1
  18. include/linux/i2c.h +1 −7
  19. include/linux/igmp.h +1 −1
  20. include/linux/ihex.h +1 −1
  21. include/linux/iio/iio.h +1 −1
  22. include/linux/irq.h +2 −4
  23. include/linux/irqchip/arm-gic-v3.h +2 −0
  24. include/linux/kvm_host.h +1 −1
  25. include/linux/list_lru.h +1 −1
  26. include/linux/memcontrol.h +2 −2
  27. include/linux/nfs_xdr.h +2 −0
  28. include/linux/platform_data/wilco-ec.h +1 −1
  29. include/linux/pnp.h +9 −20
  30. include/linux/posix_acl.h +1 −1
  31. include/linux/rio.h +2 −2
  32. include/linux/rslib.h +1 −1
  33. include/linux/sched/topology.h +1 −1
  34. include/linux/skbuff.h +1 −1
  35. include/linux/stmmac.h +2 −0
  36. include/linux/sunrpc/clnt.h +12 −1
  37. include/linux/sunrpc/svc_rdma.h +1 −0
  38. include/linux/swap.h +1 −1
  39. include/linux/ti_wilink_st.h +3 −3
  40. include/linux/tpm_eventlog.h +3 −3
  41. include/linux/tracepoint.h +1 −21
  42. include/linux/vdpa.h +1 −1
  43. include/linux/vermagic.h +5 −3
  44. include/linux/virtio.h +0 −1
  45. include/linux/vmalloc.h +1 −1
  46. include/linux/vringh.h +6 −0
  47. include/linux/xattr.h +1 −1
include/linux/backing-dev-defs.h+0−1
@@ -54,7 +54,6 @@ enum wb_reason { · 53 unmodified lines
5454 WB_REASON_SYNC,
5555 WB_REASON_PERIODIC,
5656 WB_REASON_LAPTOP_TIMER,
57− WB_REASON_FREE_MORE_MEM,
5857 WB_REASON_FS_FREE_SPACE,
5958 /*
6059 * There is no bdi forker thread any more and works are done
include/linux/bio.h+1−1
@@ -319,7 +319,7 @@ struct bio_integrity_payload { · 318 unmodified lines
319319 struct work_struct bip_work; /* I/O completion */
320320
321321 struct bio_vec *bip_vec;
322− struct bio_vec bip_inline_vecs[0];/* embedded bvec array */
322+ struct bio_vec bip_inline_vecs[];/* embedded bvec array */
323323 };
324324
325325 #if defined(CONFIG_BLK_DEV_INTEGRITY)
include/linux/blk-mq.h+1−1
@@ -173,7 +173,7 @@ struct blk_mq_hw_ctx { · 172 unmodified lines
173173 * blocking (BLK_MQ_F_BLOCKING). Must be the last member - see also
174174 * blk_mq_hw_ctx_size().
175175 */
176− struct srcu_struct srcu[0];
176+ struct srcu_struct srcu[];
177177 };
178178
179179 /**
include/linux/blk_types.h+1−1
@@ -198,7 +198,7 @@ struct bio { · 197 unmodified lines
198198 * double allocations for a small number of bio_vecs. This member
199199 * MUST obviously be kept at the very end of the bio.
200200 */
201− struct bio_vec bi_inline_vecs[0];
201+ struct bio_vec bi_inline_vecs[];
202202 };
203203
204204 #define BIO_RESET_BYTES offsetof(struct bio, bi_max_vecs)
include/linux/buffer_head.h+8−0
@@ -189,6 +189,8 @@ struct buffer_head *__getblk_gfp(struct block_device *bdev, sector_t block, · 188 unmodified lines
189189 void __brelse(struct buffer_head *);
190190 void __bforget(struct buffer_head *);
191191 void __breadahead(struct block_device *, sector_t block, unsigned int size);
192+void __breadahead_gfp(struct block_device *, sector_t block, unsigned int size,
193+ gfp_t gfp);
192194 struct buffer_head *__bread_gfp(struct block_device *,
193195 sector_t block, unsigned size, gfp_t gfp);
194196 void invalidate_bh_lrus(void);
@@ -319,6 +321,12 @@ sb_breadahead(struct super_block *sb, sector_t block) · 124 unmodified lines
319321 __breadahead(sb->s_bdev, block, sb->s_blocksize);
320322 }
321323
324+static inline void
325+sb_breadahead_unmovable(struct super_block *sb, sector_t block)
326+{
327+ __breadahead_gfp(sb->s_bdev, block, sb->s_blocksize, 0);
328+}
329+
322330 static inline struct buffer_head *
323331 sb_getblk(struct super_block *sb, sector_t block)
324332 {
include/linux/can/dev/peak_canfd.h+2−2
@@ -189,7 +189,7 @@ struct __packed pucan_rx_msg { · 188 unmodified lines
189189 u8 client;
190190 __le16 flags;
191191 __le32 can_id;
192− u8 d[0];
192+ u8 d[];
193193 };
194194
195195 /* uCAN error types */
@@ -266,7 +266,7 @@ struct __packed pucan_tx_msg { · 70 unmodified lines
266266 u8 client;
267267 __le16 flags;
268268 __le32 can_id;
269− u8 d[0];
269+ u8 d[];
270270 };
271271
272272 /* build the cmd opcode_channel field with respect to the correct endianness */
include/linux/cpu_rmap.h+1−1
@@ -28,7 +28,7 @@ struct cpu_rmap { · 27 unmodified lines
2828 struct {
2929 u16 index;
3030 u16 dist;
31− } near[0];
31+ } near[];
3232 };
3333 #define CPU_RMAP_DIST_INF 0xffff
3434
include/linux/debugfs.h+4−8
@@ -103,8 +103,8 @@ void debugfs_create_u8(const char *name, umode_t mode, struct dentry *parent, · 102 unmodified lines
103103 u8 *value);
104104 void debugfs_create_u16(const char *name, umode_t mode, struct dentry *parent,
105105 u16 *value);
106−struct dentry *debugfs_create_u32(const char *name, umode_t mode,
107− struct dentry *parent, u32 *value);
106+void debugfs_create_u32(const char *name, umode_t mode, struct dentry *parent,
107+ u32 *value);
108108 void debugfs_create_u64(const char *name, umode_t mode, struct dentry *parent,
109109 u64 *value);
110110 struct dentry *debugfs_create_ulong(const char *name, umode_t mode,
@@ -250,12 +250,8 @@ static inline void debugfs_create_u8(const char *name, umode_t mode, · 139 unmodified lines
250250 static inline void debugfs_create_u16(const char *name, umode_t mode,
251251 struct dentry *parent, u16 *value) { }
252252
253−static inline struct dentry *debugfs_create_u32(const char *name, umode_t mode,
254− struct dentry *parent,
255− u32 *value)
256−{
257− return ERR_PTR(-ENODEV);
258−}
253+static inline void debugfs_create_u32(const char *name, umode_t mode,
254+ struct dentry *parent, u32 *value) { }
259255
260256 static inline void debugfs_create_u64(const char *name, umode_t mode,
261257 struct dentry *parent, u64 *value) { }
include/linux/digsig.h+2−2
@@ -29,7 +29,7 @@ struct pubkey_hdr { · 28 unmodified lines
2929 uint32_t timestamp; /* key made, always 0 for now */
3030 uint8_t algo;
3131 uint8_t nmpi;
32− char mpi[0];
32+ char mpi[];
3333 } __packed;
3434
3535 struct signature_hdr {
@@ -39,7 +39,7 @@ struct signature_hdr { · 3 unmodified lines
3939 uint8_t hash;
4040 uint8_t keyid[8];
4141 uint8_t nmpi;
42− char mpi[0];
42+ char mpi[];
4343 } __packed;
4444
4545 #if defined(CONFIG_SIGNATURE) || defined(CONFIG_SIGNATURE_MODULE)
include/linux/dirent.h+1−1
@@ -7,7 +7,7 @@ struct linux_dirent64 { · 6 unmodified lines
77 s64 d_off;
88 unsigned short d_reclen;
99 unsigned char d_type;
10− char d_name[0];
10+ char d_name[];
1111 };
1212
1313 #endif
include/linux/dma-buf.h+1−2
@@ -329,13 +329,12 @@ struct dma_buf { · 328 unmodified lines
329329
330330 /**
331331 * struct dma_buf_attach_ops - importer operations for an attachment
332− * @move_notify: [optional] notification that the DMA-buf is moving
333332 *
334333 * Attachment operations implemented by the importer.
335334 */
336335 struct dma_buf_attach_ops {
337336 /**
338− * @move_notify
337+ * @move_notify: [optional] notification that the DMA-buf is moving
339338 *
340339 * If this callback is provided the framework can avoid pinning the
341340 * backing store while mappings exists.
include/linux/dmaengine.h+6−6
@@ -83,9 +83,9 @@ enum dma_transfer_direction { · 82 unmodified lines
8383 /**
8484 * Interleaved Transfer Request
8585 * ----------------------------
86− * A chunk is collection of contiguous bytes to be transfered.
86+ * A chunk is collection of contiguous bytes to be transferred.
8787 * The gap(in bytes) between two chunks is called inter-chunk-gap(ICG).
88− * ICGs may or maynot change between chunks.
88+ * ICGs may or may not change between chunks.
8989 * A FRAME is the smallest series of contiguous {chunk,icg} pairs,
9090 * that when repeated an integral number of times, specifies the transfer.
9191 * A transfer template is specification of a Frame, the number of times
@@ -341,13 +341,11 @@ struct dma_chan { · 249 unmodified lines
341341 * @chan: driver channel device
342342 * @device: sysfs device
343343 * @dev_id: parent dma_device dev_id
344− * @idr_ref: reference count to gate release of dma_device dev_id
345344 */
346345 struct dma_chan_dev {
347346 struct dma_chan *chan;
348347 struct device device;
349348 int dev_id;
350− atomic_t *idr_ref;
351349 };
352350
353351 /**
@@ -835,6 +833,8 @@ struct dma_device { · 481 unmodified lines
835833 int dev_id;
836834 struct device *dev;
837835 struct module *owner;
836+ struct ida chan_ida;
837+ struct mutex chan_mutex; /* to protect chan_ida */
838838
839839 u32 src_addr_widths;
840840 u32 dst_addr_widths;
@@ -1069,7 +1069,7 @@ static inline int dmaengine_terminate_all(struct dma_chan *chan) · 228 unmodified lines
10691069 * dmaengine_synchronize() needs to be called before it is safe to free
10701070 * any memory that is accessed by previously submitted descriptors or before
10711071 * freeing any resources accessed from within the completion callback of any
1072− * perviously submitted descriptors.
1072+ * previously submitted descriptors.
10731073 *
10741074 * This function can be called from atomic context as well as from within a
10751075 * complete callback of a descriptor submitted on the same channel.
@@ -1091,7 +1091,7 @@ static inline int dmaengine_terminate_async(struct dma_chan *chan) · 15 unmodified lines
10911091 *
10921092 * Synchronizes to the DMA channel termination to the current context. When this
10931093 * function returns it is guaranteed that all transfers for previously issued
1094− * descriptors have stopped and and it is safe to free the memory assoicated
1094+ * descriptors have stopped and it is safe to free the memory associated
10951095 * with them. Furthermore it is guaranteed that all complete callback functions
10961096 * for a previously submitted descriptor have finished running and it is safe to
10971097 * free resources accessed from within the complete callbacks.
include/linux/enclosure.h+1−1
@@ -101,7 +101,7 @@ struct enclosure_device { · 100 unmodified lines
101101 struct device edev;
102102 struct enclosure_component_callbacks *cb;
103103 int components;
104− struct enclosure_component component[0];
104+ struct enclosure_component component[];
105105 };
106106
107107 static inline struct enclosure_device *
include/linux/energy_model.h+1−1
@@ -36,7 +36,7 @@ struct em_cap_state { · 35 unmodified lines
3636 struct em_perf_domain {
3737 struct em_cap_state *table;
3838 int nr_cap_states;
39− unsigned long cpus[0];
39+ unsigned long cpus[];
4040 };
4141
4242 #ifdef CONFIG_ENERGY_MODEL
include/linux/ethtool.h+2−2
@@ -35,7 +35,7 @@ struct compat_ethtool_rxnfc { · 34 unmodified lines
3535 compat_u64 data;
3636 struct compat_ethtool_rx_flow_spec fs;
3737 u32 rule_cnt;
38− u32 rule_locs[0];
38+ u32 rule_locs[];
3939 };
4040
4141 #endif /* CONFIG_COMPAT */
@@ -462,7 +462,7 @@ int ethtool_check_ops(const struct ethtool_ops *ops); · 420 unmodified lines
462462
463463 struct ethtool_rx_flow_rule {
464464 struct flow_rule *rule;
465− unsigned long priv[0];
465+ unsigned long priv[];
466466 };
467467
468468 struct ethtool_rx_flow_spec_input {
include/linux/genalloc.h+1−1
@@ -76,7 +76,7 @@ struct gen_pool_chunk { · 75 unmodified lines
7676 void *owner; /* private data to retrieve at alloc time */
7777 unsigned long start_addr; /* start address of memory chunk */
7878 unsigned long end_addr; /* end address of memory chunk (inclusive) */
79− unsigned long bits[0]; /* bitmap for allocating memory chunk */
79+ unsigned long bits[]; /* bitmap for allocating memory chunk */
8080 };
8181
8282 /*
include/linux/i2c-mux.h+1−1
@@ -29,7 +29,7 @@ struct i2c_mux_core { · 28 unmodified lines
2929
3030 int num_adapters;
3131 int max_adapters;
32− struct i2c_adapter *adapter[0];
32+ struct i2c_adapter *adapter[];
3333 };
3434
3535 struct i2c_mux_core *i2c_mux_alloc(struct i2c_adapter *parent,
include/linux/i2c.h+1−7
@@ -2,7 +2,7 @@ · 1 unmodified line
22 /*
33 * i2c.h - definitions for the Linux i2c bus interface
44 * Copyright (C) 1995-2000 Simon G. Vogl
5− * Copyright (C) 2013-2019 Wolfram Sang <wsa@the-dreams.de>
5+ * Copyright (C) 2013-2019 Wolfram Sang <wsa@kernel.org>
66 *
77 * With some changes from Kyösti Mälkki <kmalkki@cc.hut.fi> and
88 * Frodo Looijaard <frodol@dds.nl>
@@ -462,12 +462,6 @@ i2c_new_scanned_device(struct i2c_adapter *adap, · 453 unmodified lines
462462 unsigned short const *addr_list,
463463 int (*probe)(struct i2c_adapter *adap, unsigned short addr));
464464
465−struct i2c_client *
466−i2c_new_probed_device(struct i2c_adapter *adap,
467− struct i2c_board_info *info,
468− unsigned short const *addr_list,
469− int (*probe)(struct i2c_adapter *adap, unsigned short addr));
470−
471465 /* Common custom probe functions */
472466 int i2c_probe_func_quick_read(struct i2c_adapter *adap, unsigned short addr);
473467
include/linux/igmp.h+1−1
@@ -38,7 +38,7 @@ struct ip_sf_socklist { · 37 unmodified lines
3838 unsigned int sl_max;
3939 unsigned int sl_count;
4040 struct rcu_head rcu;
41− __be32 sl_addr[0];
41+ __be32 sl_addr[];
4242 };
4343
4444 #define IP_SFLSIZE(count) (sizeof(struct ip_sf_socklist) + \
include/linux/ihex.h+1−1
@@ -18,7 +18,7 @@ · 17 unmodified lines
1818 struct ihex_binrec {
1919 __be32 addr;
2020 __be16 len;
21− uint8_t data[0];
21+ uint8_t data[];
2222 } __attribute__((packed));
2323
2424 static inline uint16_t ihex_binrec_size(const struct ihex_binrec *p)
include/linux/iio/iio.h+1−1
@@ -600,7 +600,7 @@ void iio_device_unregister(struct iio_dev *indio_dev); · 599 unmodified lines
600600 * 0 on success, negative error number on failure.
601601 */
602602 #define devm_iio_device_register(dev, indio_dev) \
603− __devm_iio_device_register((dev), (indio_dev), THIS_MODULE);
603+ __devm_iio_device_register((dev), (indio_dev), THIS_MODULE)
604604 int __devm_iio_device_register(struct device *dev, struct iio_dev *indio_dev,
605605 struct module *this_mod);
606606 void devm_iio_device_unregister(struct device *dev, struct iio_dev *indio_dev);
include/linux/irq.h+2−4
@@ -573,8 +573,6 @@ enum { · 572 unmodified lines
573573 #define IRQ_DEFAULT_INIT_FLAGS ARCH_IRQ_INIT_FLAGS
574574
575575 struct irqaction;
576−extern int setup_irq(unsigned int irq, struct irqaction *new);
577−extern void remove_irq(unsigned int irq, struct irqaction *act);
578576 extern int setup_percpu_irq(unsigned int irq, struct irqaction *new);
579577 extern void remove_percpu_irq(unsigned int irq, struct irqaction *act);
580578
@@ -1043,7 +1041,7 @@ struct irq_chip_generic { · 462 unmodified lines
10431041 unsigned long unused;
10441042 struct irq_domain *domain;
10451043 struct list_head list;
1046− struct irq_chip_type chip_types[0];
1044+ struct irq_chip_type chip_types[];
10471045 };
10481046
10491047 /**
@@ -1079,7 +1077,7 @@ struct irq_domain_chip_generic { · 29 unmodified lines
10791077 unsigned int irq_flags_to_clear;
10801078 unsigned int irq_flags_to_set;
10811079 enum irq_gc_flags gc_flags;
1082− struct irq_chip_generic *gc[0];
1080+ struct irq_chip_generic *gc[];
10831081 };
10841082
10851083 /* Generic chip callback functions */
include/linux/irqchip/arm-gic-v3.h+2−0
@@ -243,6 +243,7 @@ · 242 unmodified lines
243243
244244 #define GICR_TYPER_PLPIS (1U << 0)
245245 #define GICR_TYPER_VLPIS (1U << 1)
246+#define GICR_TYPER_DIRTY (1U << 2)
246247 #define GICR_TYPER_DirectLPIS (1U << 3)
247248 #define GICR_TYPER_LAST (1U << 4)
248249 #define GICR_TYPER_RVPEID (1U << 7)
@@ -686,6 +687,7 @@ struct rdists { · 437 unmodified lines
686687 bool has_vlpis;
687688 bool has_rvpeid;
688689 bool has_direct_lpi;
690+ bool has_vpend_valid_dirty;
689691 };
690692
691693 struct irq_domain;
include/linux/kvm_host.h+1−1
@@ -1048,7 +1048,7 @@ search_memslots(struct kvm_memslots *slots, gfn_t gfn) · 1047 unmodified lines
10481048 start = slot + 1;
10491049 }
10501050
1051− if (gfn >= memslots[start].base_gfn &&
1051+ if (start < slots->used_slots && gfn >= memslots[start].base_gfn &&
10521052 gfn < memslots[start].base_gfn + memslots[start].npages) {
10531053 atomic_set(&slots->lru_slot, start);
10541054 return &memslots[start];
include/linux/list_lru.h+1−1
@@ -34,7 +34,7 @@ struct list_lru_one { · 33 unmodified lines
3434 struct list_lru_memcg {
3535 struct rcu_head rcu;
3636 /* array of per cgroup lists, indexed by memcg_cache_id */
37− struct list_lru_one *lru[0];
37+ struct list_lru_one *lru[];
3838 };
3939
4040 struct list_lru_node {
include/linux/memcontrol.h+2−2
@@ -106,7 +106,7 @@ struct lruvec_stat { · 105 unmodified lines
106106 */
107107 struct memcg_shrinker_map {
108108 struct rcu_head rcu;
109− unsigned long map[0];
109+ unsigned long map[];
110110 };
111111
112112 /*
@@ -148,7 +148,7 @@ struct mem_cgroup_threshold_ary { · 35 unmodified lines
148148 /* Size of entries[] */
149149 unsigned int size;
150150 /* Array of thresholds */
151− struct mem_cgroup_threshold entries[0];
151+ struct mem_cgroup_threshold entries[];
152152 };
153153
154154 struct mem_cgroup_thresholds {
include/linux/nfs_xdr.h+2−0
@@ -1317,11 +1317,13 @@ struct nfs41_impl_id { · 1316 unmodified lines
13171317 struct nfstime4 date;
13181318 };
13191319
1320+#define MAX_BIND_CONN_TO_SESSION_RETRIES 3
13201321 struct nfs41_bind_conn_to_session_args {
13211322 struct nfs_client *client;
13221323 struct nfs4_sessionid sessionid;
13231324 u32 dir;
13241325 bool use_conn_in_rdma_mode;
1326+ int retries;
13251327 };
13261328
13271329 struct nfs41_bind_conn_to_session_res {
include/linux/platform_data/wilco-ec.h+1−1
@@ -83,7 +83,7 @@ struct wilco_ec_response { · 82 unmodified lines
8383 u16 result;
8484 u16 data_size;
8585 u8 reserved[2];
86− u8 data[0];
86+ u8 data[];
8787 } __packed;
8888
8989 /**
include/linux/pnp.h+9−20
@@ -220,10 +220,8 @@ struct pnp_card { · 219 unmodified lines
220220 #define global_to_pnp_card(n) list_entry(n, struct pnp_card, global_list)
221221 #define protocol_to_pnp_card(n) list_entry(n, struct pnp_card, protocol_list)
222222 #define to_pnp_card(n) container_of(n, struct pnp_card, dev)
223−#define pnp_for_each_card(card) \
224− for((card) = global_to_pnp_card(pnp_cards.next); \
225− (card) != global_to_pnp_card(&pnp_cards); \
226− (card) = global_to_pnp_card((card)->global_list.next))
223+#define pnp_for_each_card(card) \
224+ list_for_each_entry(card, &pnp_cards, global_list)
227225
228226 struct pnp_card_link {
229227 struct pnp_card *card;
@@ -276,14 +274,9 @@ struct pnp_dev { · 46 unmodified lines
276274 #define card_to_pnp_dev(n) list_entry(n, struct pnp_dev, card_list)
277275 #define protocol_to_pnp_dev(n) list_entry(n, struct pnp_dev, protocol_list)
278276 #define to_pnp_dev(n) container_of(n, struct pnp_dev, dev)
279−#define pnp_for_each_dev(dev) \
280− for((dev) = global_to_pnp_dev(pnp_global.next); \
281− (dev) != global_to_pnp_dev(&pnp_global); \
282− (dev) = global_to_pnp_dev((dev)->global_list.next))
283−#define card_for_each_dev(card,dev) \
284− for((dev) = card_to_pnp_dev((card)->devices.next); \
285− (dev) != card_to_pnp_dev(&(card)->devices); \
286− (dev) = card_to_pnp_dev((dev)->card_list.next))
277+#define pnp_for_each_dev(dev) list_for_each_entry(dev, &pnp_global, global_list)
278+#define card_for_each_dev(card, dev) \
279+ list_for_each_entry(dev, &(card)->devices, card_list)
287280 #define pnp_dev_name(dev) (dev)->name
288281
289282 static inline void *pnp_get_drvdata(struct pnp_dev *pdev)
@@ -437,14 +430,10 @@ struct pnp_protocol { · 147 unmodified lines
437430 };
438431
439432 #define to_pnp_protocol(n) list_entry(n, struct pnp_protocol, protocol_list)
440−#define protocol_for_each_card(protocol,card) \
441− for((card) = protocol_to_pnp_card((protocol)->cards.next); \
442− (card) != protocol_to_pnp_card(&(protocol)->cards); \
443− (card) = protocol_to_pnp_card((card)->protocol_list.next))
444−#define protocol_for_each_dev(protocol,dev) \
445− for((dev) = protocol_to_pnp_dev((protocol)->devices.next); \
446− (dev) != protocol_to_pnp_dev(&(protocol)->devices); \
447− (dev) = protocol_to_pnp_dev((dev)->protocol_list.next))
433+#define protocol_for_each_card(protocol, card) \
434+ list_for_each_entry(card, &(protocol)->cards, protocol_list)
435+#define protocol_for_each_dev(protocol, dev) \
436+ list_for_each_entry(dev, &(protocol)->devices, protocol_list)
448437
449438 extern struct bus_type pnp_bus_type;
450439
include/linux/posix_acl.h+1−1
@@ -28,7 +28,7 @@ struct posix_acl { · 27 unmodified lines
2828 refcount_t a_refcount;
2929 struct rcu_head a_rcu;
3030 unsigned int a_count;
31− struct posix_acl_entry a_entries[0];
31+ struct posix_acl_entry a_entries[];
3232 };
3333
3434 #define FOREACH_ACL_ENTRY(pa, acl, pe) \
include/linux/rio.h+2−2
@@ -100,7 +100,7 @@ struct rio_switch { · 99 unmodified lines
100100 u32 port_ok;
101101 struct rio_switch_ops *ops;
102102 spinlock_t lock;
103− struct rio_dev *nextdev[0];
103+ struct rio_dev *nextdev[];
104104 };
105105
106106 /**
@@ -201,7 +201,7 @@ struct rio_dev { · 94 unmodified lines
201201 u8 hopcount;
202202 struct rio_dev *prev;
203203 atomic_t state;
204− struct rio_switch rswitch[0]; /* RIO switch info */
204+ struct rio_switch rswitch[]; /* RIO switch info */
205205 };
206206
207207 #define rio_dev_g(n) list_entry(n, struct rio_dev, global_list)
include/linux/rslib.h+1−1
@@ -54,7 +54,7 @@ struct rs_codec { · 53 unmodified lines
5454 */
5555 struct rs_control {
5656 struct rs_codec *codec;
57− uint16_t buffers[0];
57+ uint16_t buffers[];
5858 };
5959
6060 /* General purpose RS codec, 8-bit data width, symbol width 1-15 bit */
include/linux/sched/topology.h+1−1
@@ -142,7 +142,7 @@ struct sched_domain { · 141 unmodified lines
142142 * by attaching extra space to the end of the structure,
143143 * depending on how many CPUs the kernel has booted up with)
144144 */
145− unsigned long span[0];
145+ unsigned long span[];
146146 };
147147
148148 static inline struct cpumask *sched_domain_span(struct sched_domain *sd)
include/linux/skbuff.h+1−1
@@ -4162,7 +4162,7 @@ struct skb_ext { · 4161 unmodified lines
41624162 refcount_t refcnt;
41634163 u8 offset[SKB_EXT_NUM]; /* in chunks of 8 bytes */
41644164 u8 chunks; /* same */
4165− char data[0] __aligned(8);
4165+ char data[] __aligned(8);
41664166 };
41674167
41684168 struct skb_ext *__skb_ext_alloc(void);
include/linux/stmmac.h+2−0
@@ -177,6 +177,8 @@ struct plat_stmmacenet_data { · 176 unmodified lines
177177 struct stmmac_rxq_cfg rx_queues_cfg[MTL_MAX_RX_QUEUES];
178178 struct stmmac_txq_cfg tx_queues_cfg[MTL_MAX_TX_QUEUES];
179179 void (*fix_mac_speed)(void *priv, unsigned int speed);
180+ int (*serdes_powerup)(struct net_device *ndev, void *priv);
181+ void (*serdes_powerdown)(struct net_device *ndev, void *priv);
180182 int (*init)(struct platform_device *pdev, void *priv);
181183 void (*exit)(struct platform_device *pdev, void *priv);
182184 struct mac_device_info *(*setup)(void *priv);
include/linux/sunrpc/clnt.h+12−1
@@ -71,7 +71,13 @@ struct rpc_clnt { · 70 unmodified lines
7171 #if IS_ENABLED(CONFIG_SUNRPC_DEBUG)
7272 struct dentry *cl_debugfs; /* debugfs directory */
7373 #endif
74− struct rpc_xprt_iter cl_xpi;
74+ /* cl_work is only needed after cl_xpi is no longer used,
75+ * and that are of similar size
76+ */
77+ union {
78+ struct rpc_xprt_iter cl_xpi;
79+ struct work_struct cl_work;
80+ };
7581 const struct cred *cl_cred;
7682 };
7783
@@ -236,4 +242,9 @@ static inline int rpc_reply_expected(struct rpc_task *task) · 158 unmodified lines
236242 (task->tk_msg.rpc_proc->p_decode != NULL);
237243 }
238244
245+static inline void rpc_task_close_connection(struct rpc_task *task)
246+{
247+ if (task->tk_xprt)
248+ xprt_force_disconnect(task->tk_xprt);
249+}
239250 #endif /* _LINUX_SUNRPC_CLNT_H */
include/linux/sunrpc/svc_rdma.h+1−0
@@ -170,6 +170,7 @@ extern bool svc_rdma_post_recvs(struct svcxprt_rdma *rdma); · 169 unmodified lines
170170 extern void svc_rdma_recv_ctxt_put(struct svcxprt_rdma *rdma,
171171 struct svc_rdma_recv_ctxt *ctxt);
172172 extern void svc_rdma_flush_recv_queues(struct svcxprt_rdma *rdma);
173+extern void svc_rdma_release_rqst(struct svc_rqst *rqstp);
173174 extern int svc_rdma_recvfrom(struct svc_rqst *);
174175
175176 /* svc_rdma_rw.c */
include/linux/swap.h+1−1
@@ -275,7 +275,7 @@ struct swap_info_struct { · 274 unmodified lines
275275 */
276276 struct work_struct discard_work; /* discard worker */
277277 struct swap_cluster_list discard_clusters; /* discard clusters list */
278− struct plist_node avail_lists[0]; /*
278+ struct plist_node avail_lists[]; /*
279279 * entries in swap_avail_heads, one
280280 * entry per node.
281281 * Must be last as the number of the
include/linux/ti_wilink_st.h+3−3
@@ -295,7 +295,7 @@ struct bts_header { · 294 unmodified lines
295295 u32 magic;
296296 u32 version;
297297 u8 future[24];
298− u8 actions[0];
298+ u8 actions[];
299299 } __attribute__ ((packed));
300300
301301 /**
@@ -305,7 +305,7 @@ struct bts_header { · 3 unmodified lines
305305 struct bts_action {
306306 u16 type;
307307 u16 size;
308− u8 data[0];
308+ u8 data[];
309309 } __attribute__ ((packed));
310310
311311 struct bts_action_send {
@@ -315,7 +315,7 @@ struct bts_action_send { · 3 unmodified lines
315315 struct bts_action_wait {
316316 u32 msec;
317317 u32 size;
318− u8 data[0];
318+ u8 data[];
319319 } __attribute__ ((packed));
320320
321321 struct bts_action_delay {
include/linux/tpm_eventlog.h+3−3
@@ -28,7 +28,7 @@ struct tcpa_event { · 27 unmodified lines
2828 u32 event_type;
2929 u8 pcr_value[20]; /* SHA1 */
3030 u32 event_size;
31− u8 event_data[0];
31+ u8 event_data[];
3232 };
3333
3434 enum tcpa_event_types {
@@ -55,7 +55,7 @@ enum tcpa_event_types { · 20 unmodified lines
5555 struct tcpa_pc_event {
5656 u32 event_id;
5757 u32 event_size;
58− u8 event_data[0];
58+ u8 event_data[];
5959 };
6060
6161 enum tcpa_pc_event_ids {
@@ -102,7 +102,7 @@ struct tcg_pcr_event { · 40 unmodified lines
102102
103103 struct tcg_event_field {
104104 u32 event_size;
105− u8 event[0];
105+ u8 event[];
106106 } __packed;
107107
108108 struct tcg_pcr_event2_head {
include/linux/tracepoint.h+1−21
@@ -156,8 +156,7 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) · 155 unmodified lines
156156 * Note, the proto and args passed in includes "__data" as the first parameter.
157157 * The reason for this is to handle the "void" prototype. If a tracepoint
158158 * has a "void" prototype, then it is invalid to declare a function
159− * as "(void *, void)". The DECLARE_TRACE_NOARGS() will pass in just
160− * "void *data", where as the DECLARE_TRACE() will pass in "void *data, proto".
159+ * as "(void *, void)".
161160 */
162161 #define __DO_TRACE(tp, proto, args, cond, rcuidle) \
163162 do { \
@@ -373,25 +372,6 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) · 209 unmodified lines
373372 # define __tracepoint_string
374373 #endif
375374
376−/*
377− * The need for the DECLARE_TRACE_NOARGS() is to handle the prototype
378− * (void). "void" is a special value in a function prototype and can
379− * not be combined with other arguments. Since the DECLARE_TRACE()
380− * macro adds a data element at the beginning of the prototype,
381− * we need a way to differentiate "(void *data, proto)" from
382− * "(void *data, void)". The second prototype is invalid.
383− *
384− * DECLARE_TRACE_NOARGS() passes "void" as the tracepoint prototype
385− * and "void *__data" as the callback prototype.
386− *
387− * DECLARE_TRACE() passes "proto" as the tracepoint protoype and
388− * "void *__data, proto" as the callback prototype.
389− */
390−#define DECLARE_TRACE_NOARGS(name) \
391− __DECLARE_TRACE(name, void, , \
392− cpu_online(raw_smp_processor_id()), \
393− void *__data, __data)
394−
395375 #define DECLARE_TRACE(name, proto, args) \
396376 __DECLARE_TRACE(name, PARAMS(proto), PARAMS(args), \
397377 cpu_online(raw_smp_processor_id()), \
include/linux/vdpa.h+1−1
@@ -164,7 +164,7 @@ struct vdpa_config_ops { · 163 unmodified lines
164164 u64 (*get_vq_state)(struct vdpa_device *vdev, u16 idx);
165165
166166 /* Device ops */
167− u16 (*get_vq_align)(struct vdpa_device *vdev);
167+ u32 (*get_vq_align)(struct vdpa_device *vdev);
168168 u64 (*get_features)(struct vdpa_device *vdev);
169169 int (*set_features)(struct vdpa_device *vdev, u64 features);
170170 void (*set_config_cb)(struct vdpa_device *vdev,
include/linux/vermagic.h+5−3
@@ -1,5 +1,9 @@
11 /* SPDX-License-Identifier: GPL-2.0 */
2+#ifndef _LINUX_VERMAGIC_H
3+#define _LINUX_VERMAGIC_H
4+
25 #include <generated/utsrelease.h>
6+#include <asm/vermagic.h>
37
48 /* Simply sanity version stamp for modules. */
59 #ifdef CONFIG_SMP
@@ -24,9 +28,6 @@ · 18 unmodified lines
2428 #else
2529 #define MODULE_VERMAGIC_MODVERSIONS ""
2630 #endif
27−#ifndef MODULE_ARCH_VERMAGIC
28−#define MODULE_ARCH_VERMAGIC ""
29−#endif
3031 #ifdef RANDSTRUCT_PLUGIN
3132 #include <generated/randomize_layout_hash.h>
3233 #define MODULE_RANDSTRUCT_PLUGIN "RANDSTRUCT_PLUGIN_" RANDSTRUCT_HASHED_SEED
@@ -41,3 +42,4 @@ · 8 unmodified lines
4142 MODULE_ARCH_VERMAGIC \
4243 MODULE_RANDSTRUCT_PLUGIN
4344
45+#endif /* _LINUX_VERMAGIC_H */
include/linux/virtio.h+0−1
@@ -9,7 +9,6 @@ · 8 unmodified lines
99 #include <linux/device.h>
1010 #include <linux/mod_devicetable.h>
1111 #include <linux/gfp.h>
12−#include <linux/vringh.h>
1312
1413 /**
1514 * virtqueue - a queue to register buffers for sending or receiving.
include/linux/vmalloc.h+1−1
@@ -137,7 +137,7 @@ extern void vunmap(const void *addr); · 136 unmodified lines
137137
138138 extern int remap_vmalloc_range_partial(struct vm_area_struct *vma,
139139 unsigned long uaddr, void *kaddr,
140− unsigned long size);
140+ unsigned long pgoff, unsigned long size);
141141
142142 extern int remap_vmalloc_range(struct vm_area_struct *vma, void *addr,
143143 unsigned long pgoff);
include/linux/vringh.h+6−0
@@ -14,8 +14,10 @@ · 13 unmodified lines
1414 #include <linux/virtio_byteorder.h>
1515 #include <linux/uio.h>
1616 #include <linux/slab.h>
17+#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
1718 #include <linux/dma-direction.h>
1819 #include <linux/vhost_iotlb.h>
20+#endif
1921 #include <asm/barrier.h>
2022
2123 /* virtio_ring with information needed for host access. */
@@ -254,6 +256,8 @@ static inline __virtio64 cpu_to_vringh64(const struct vringh *vrh, u64 val) · 232 unmodified lines
254256 return __cpu_to_virtio64(vringh_is_little_endian(vrh), val);
255257 }
256258
259+#if IS_REACHABLE(CONFIG_VHOST_IOTLB)
260+
257261 void vringh_set_iotlb(struct vringh *vrh, struct vhost_iotlb *iotlb);
258262
259263 int vringh_init_iotlb(struct vringh *vrh, u64 features,
@@ -284,4 +288,6 @@ void vringh_notify_disable_iotlb(struct vringh *vrh); · 24 unmodified lines
284288
285289 int vringh_need_notify_iotlb(struct vringh *vrh);
286290
291+#endif /* CONFIG_VHOST_IOTLB */
292+
287293 #endif /* _LINUX_VRINGH_H */
include/linux/xattr.h+1−1
@@ -73,7 +73,7 @@ struct simple_xattr { · 72 unmodified lines
7373 struct list_head list;
7474 char *name;
7575 size_t size;
76− char value[0];
76+ char value[];
7777 };
7878
7979 /*