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 /lib | |
| parent | ecbe5086adc2876b22c898987d8a20f932de87a9 (diff) | |
| parent | 8751853091998cd31e9e5f1e8206280155af8921 (diff) | |
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 'lib')
| -rw-r--r-- | lib/devres.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/devres.c b/lib/devres.c index 69bed2f38306..6a0e9bd6524a 100644 --- a/lib/devres.c +++ b/lib/devres.c @@ -131,7 +131,8 @@ EXPORT_SYMBOL(devm_iounmap); * if (IS_ERR(base)) * return PTR_ERR(base); */ -void __iomem *devm_ioremap_resource(struct device *dev, struct resource *res) +void __iomem *devm_ioremap_resource(struct device *dev, + const struct resource *res) { resource_size_t size; void __iomem *dest_ptr; |