Required due to dependencies in following patches.
Showing the changes to include/linux (5 of 343 files). Show all
Unified · Split
| @@ -1494,7 +1494,6 @@ static inline void put_dev_sector(Sector p) · 1493 unmodified lines | ||
| 1494 | 1494 | } |
| 1495 | 1495 | |
| 1496 | 1496 | int kblockd_schedule_work(struct work_struct *work); |
| 1497 | −int kblockd_schedule_work_on(int cpu, struct work_struct *work); | |
| 1498 | 1497 | int kblockd_mod_delayed_work_on(int cpu, struct delayed_work *dwork, unsigned long delay); |
| 1499 | 1498 | |
| 1500 | 1499 | #define MODULE_ALIAS_BLOCKDEV(major,minor) \ |
| @@ -127,9 +127,9 @@ struct dentry *debugfs_create_blob(const char *name, umode_t mode, · 126 unmodified lines | ||
| 127 | 127 | struct dentry *parent, |
| 128 | 128 | struct debugfs_blob_wrapper *blob); |
| 129 | 129 | |
| 130 | −struct dentry *debugfs_create_regset32(const char *name, umode_t mode, | |
| 131 | − struct dentry *parent, | |
| 132 | − struct debugfs_regset32 *regset); | |
| 130 | +void debugfs_create_regset32(const char *name, umode_t mode, | |
| 131 | + struct dentry *parent, | |
| 132 | + struct debugfs_regset32 *regset); | |
| 133 | 133 | |
| 134 | 134 | void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs, |
| 135 | 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 | 304 | return ERR_PTR(-ENODEV); |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | −static inline struct dentry *debugfs_create_regset32(const char *name, | |
| 308 | − umode_t mode, struct dentry *parent, | |
| 309 | − struct debugfs_regset32 *regset) | |
| 307 | +static inline void debugfs_create_regset32(const char *name, umode_t mode, | |
| 308 | + struct dentry *parent, | |
| 309 | + struct debugfs_regset32 *regset) | |
| 310 | 310 | { |
| 311 | − return ERR_PTR(-ENODEV); | |
| 312 | 311 | } |
| 313 | 312 | |
| 314 | 313 | static inline void debugfs_print_regs32(struct seq_file *s, const struct debugfs_reg32 *regs, |
| @@ -798,6 +798,17 @@ static inline struct device_node *dev_of_node(struct device *dev) · 797 unmodified lines | ||
| 798 | 798 | return dev->of_node; |
| 799 | 799 | } |
| 800 | 800 | |
| 801 | +static 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 | 813 | * High level routines for use by the bus drivers |
| 803 | 814 | */ |
| @@ -2715,6 +2715,10 @@ static inline bool debug_pagealloc_enabled_static(void) · 2714 unmodified lines | ||
| 2715 | 2715 | #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_ARCH_HAS_SET_DIRECT_MAP) |
| 2716 | 2716 | extern 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 | + */ | |
| 2718 | 2722 | static inline void |
| 2719 | 2723 | kernel_map_pages(struct page *page, int numpages, int enable) |
| 2720 | 2724 | { |
| @@ -11,6 +11,7 @@ struct omap2_mcspi_platform_config { · 10 unmodified lines | ||
| 11 | 11 | unsigned short num_cs; |
| 12 | 12 | unsigned int regs_offset; |
| 13 | 13 | unsigned int pin_dir:1; |
| 14 | + size_t max_xfer_len; | |
| 14 | 15 | }; |
| 15 | 16 | |
| 16 | 17 | struct omap2_mcspi_device_config { |