diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-05 11:39:56 +0900 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-07-05 11:39:56 +0900 |
| commit | a5fff14a0c7989fbc8316a43f52aed1804f02ddd (patch) | |
| tree | d8d4ef6c808868f7d42b6b44cc27b871a22d460a /include/linux/device.h | |
| parent | ecbe5086adc2876b22c898987d8a20f932de87a9 (diff) | |
| parent | 8751853091998cd31e9e5f1e8206280155af8921 (diff) | |
| download | lwn-a5fff14a0c7989fbc8316a43f52aed1804f02ddd.tar.gz lwn-a5fff14a0c7989fbc8316a43f52aed1804f02ddd.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge more fixes from Andrew Morton:
"5 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
swap_readpage(): avoid blk_wake_io_task() if !synchronous
devres: allow const resource arguments
mm/vmscan.c: prevent useless kswapd loops
fs/userfaultfd.c: disable irqs for fault_pending and event locks
mm/page_alloc.c: fix regression with deferred struct page init
Diffstat (limited to 'include/linux/device.h')
| -rw-r--r-- | include/linux/device.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/device.h b/include/linux/device.h index 848fc71c6ba6..4a295e324ac5 100644 --- a/include/linux/device.h +++ b/include/linux/device.h @@ -704,7 +704,8 @@ extern unsigned long devm_get_free_pages(struct device *dev, gfp_t gfp_mask, unsigned int order); extern void devm_free_pages(struct device *dev, unsigned long addr); -void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res); +void __iomem *devm_ioremap_resource(struct device *dev, + const struct resource *res); void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index, |