diff options
author | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2015-08-17 00:13:53 -0400 |
commit | 4eebf60b7452fbd551fd7dece855ba7825a49cbc (patch) | |
tree | 490b4d194ba09c90e10201ab7fc084a0bda0ed27 /mm/page-writeback.c | |
parent | 8f9cb50789e76f3e224e8861adf650e55c747af4 (diff) | |
parent | 2c6625cd545bdd66acff14f3394865d43920a5c7 (diff) |
Merge tag 'v4.2-rc7' into drm-next
Linux 4.2-rc7
Backmerge master for i915 fixes
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 = { | |||
2063 | */ | 2063 | */ |
2064 | void __init page_writeback_init(void) | 2064 | void __init page_writeback_init(void) |
2065 | { | 2065 | { |
2066 | BUG_ON(wb_domain_init(&global_wb_domain, GFP_KERNEL)); | ||
2067 | |||
2066 | writeback_set_ratelimit(); | 2068 | writeback_set_ratelimit(); |
2067 | register_cpu_notifier(&ratelimit_nb); | 2069 | register_cpu_notifier(&ratelimit_nb); |
2068 | |||
2069 | BUG_ON(wb_domain_init(&global_wb_domain, GFP_KERNEL)); | ||
2070 | } | 2070 | } |
2071 | 2071 | ||
2072 | /** | 2072 | /** |