diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-08-10 09:07:25 -0700 |
commit | f70d6318320983a8d2fac28cfe8d22dfd5e52a73 (patch) | |
tree | e3a427a3abeca491007f036b09be84944657f58e /mm/page-writeback.c | |
parent | b963e7223cb3278dda35a6550a8df08ff2be2ee5 (diff) | |
parent | f7644cbfcdf03528f0f450f3940c4985b2291f49 (diff) | |
download | linux-stable-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.gz linux-stable-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.tar.bz2 linux-stable-f70d6318320983a8d2fac28cfe8d22dfd5e52a73.zip |
Merge 4.2-rc6 into staging-next
We want the IIO and staging fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm/page-writeback.c')
-rw-r--r-- | mm/page-writeback.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 22cddd3e5de8..5cccc127ef81 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2063,10 +2063,10 @@ static struct notifier_block ratelimit_nb = { */ void __init page_writeback_init(void) { + BUG_ON(wb_domain_init(&global_wb_domain, GFP_KERNEL)); + writeback_set_ratelimit(); register_cpu_notifier(&ratelimit_nb); - - BUG_ON(wb_domain_init(&global_wb_domain, GFP_KERNEL)); } /** |