History

Merge tag 'v5.6-rc5' into rdma.git for-next

Required due to dependencies in following patches.

Jason Gunthorpe committed 6 years ago

Commit 6f00a542 parents 3e3cf2e 2c523b3343 files · +3078 −1738Browse files

Showing the changes to include/linux (5 of 343 files). Show all

Unified · Split

5 files
  1. include/linux/blkdev.h +0 −1
  2. include/linux/debugfs.h +6 −7
  3. include/linux/device.h +11 −0
  4. include/linux/mm.h +4 −0
  5. include/linux/platform_data/spi-omap2-mcspi.h +1 −0
include/linux/blkdev.h+0−1
@@ -1494,7 +1494,6 @@ static inline void put_dev_sector(Sector p) · 1493 unmodified lines
1494}1494}
1495 1495
1496int kblockd_schedule_work(struct work_struct *work);1496int kblockd_schedule_work(struct work_struct *work);
1497int kblockd_schedule_work_on(int cpu, struct work_struct *work);
1498int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);1497int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay);
1499 1498
1500#define MODULE_ALIAS_BLOCKDEV(major,minor) \1499#define MODULE_ALIAS_BLOCKDEV(major,minor) \
include/linux/debugfs.h+6−7
@@ -127,9 +127,9 @@ struct dentry *debugfs_create_blob(const char *name, umode_t mode, · 126 unmodified lines
127 struct dentry *parent,127 struct dentry *parent,
128 struct debugfs_blob_wrapper *blob);128 struct debugfs_blob_wrapper *blob);
129 129
130struct dentry *debugfs_create_regset32(const char *name, umode_t mode,130void debugfs_create_regset32(const char *name, umode_t mode,
131 struct dentry *parent,131 struct dentry *parent,
132 struct debugfs_regset32 *regset);132 struct debugfs_regset32 *regset);
133 133
134void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,134void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
135 int nregs, void __iomem *base, char *prefix);135 int nregs, void __iomem *base, char *prefix);
@@ -304,11 +304,10 @@ static inline struct dentry *debugfs_create_blob(const char *name, umode_t mode, · 168 unmodified lines
304 return ERR_PTR(-ENODEV);304 return ERR_PTR(-ENODEV);
305}305}
306 306
307static inline struct dentry *debugfs_create_regset32(const char *name,307static inline void debugfs_create_regset32(const char *name, umode_t mode,
308 umode_t mode, struct dentry *parent,308 struct dentry *parent,
309 struct debugfs_regset32 *regset)309 struct debugfs_regset32 *regset)
310{310{
311 return ERR_PTR(-ENODEV);
312}311}
313 312
314static inline void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,313static inline void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs,
include/linux/device.h+11−0
@@ -798,6 +798,17 @@ static inline struct device_node *dev_of_node(struct device *dev) · 797 unmodified lines
798 return dev->of_node;798 return dev->of_node;
799}799}
800 800
801static inline bool dev_has_sync_state(struct device *dev)
802{
803 if (!dev)
804 return false;
805 if (dev->driver && dev->driver->sync_state)
806 return true;
807 if (dev->bus && dev->bus->sync_state)
808 return true;
809 return false;
810}
811
801/*812/*
802 * High level routines for use by the bus drivers813 * High level routines for use by the bus drivers
803 */814 */
include/linux/mm.h+4−0
@@ -2715,6 +2715,10 @@ static inline bool debug_pagealloc_enabled_static(void) · 2714 unmodified lines
2715#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP)2715#if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP)
2716extern void __kernel_map_pages(struct page *page, int numpages, int enable);2716extern void __kernel_map_pages(struct page *page, int numpages, int enable);
2717 2717
2718/*
2719 * When called in DEBUG_PAGEALLOC context, the call should most likely be
2720 * guarded by debug_pagealloc_enabled() or debug_pagealloc_enabled_static()
2721 */
2718static inline void2722static inline void
2719kernel_map_pages(struct page *page, int numpages, int enable)2723kernel_map_pages(struct page *page, int numpages, int enable)
2720{2724{
include/linux/platform_data/spi-omap2-mcspi.h+1−0
@@ -11,6 +11,7 @@ struct omap2_mcspi_platform_config { · 10 unmodified lines
11 unsigned short num_cs;11 unsigned short num_cs;
12 unsigned int regs_offset;12 unsigned int regs_offset;
13 unsigned int pin_dir:1;13 unsigned int pin_dir:1;
14 size_t max_xfer_len;
14};15};
15 16
16struct omap2_mcspi_device_config {17struct omap2_mcspi_device_config {