diff options
author | 2016-05-07 07:00:07 +0200 | |
---|---|---|
committer | 2016-05-07 07:00:07 +0200 | |
commit | 35dc9ec1076b79c31bf7ed538af008b7f23bb14d (patch) | |
tree | f90affdd5dc45f47f8d5d84ea34c71e5e521e7a1 /mm/page_alloc.c | |
parent | efi: Remove unnecessary (and buggy) .memmap initialization from the Xen EFI driver (diff) | |
parent | Merge branch 'for-linus' of git://git.kernel.dk/linux-block (diff) | |
download | wireguard-linux-35dc9ec1076b79c31bf7ed538af008b7f23bb14d.tar.xz wireguard-linux-35dc9ec1076b79c31bf7ed538af008b7f23bb14d.zip |
Merge branch 'linus' into efi/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 59de90d5d3a3..c1069efcc4d7 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -6485,7 +6485,7 @@ int __meminit init_per_zone_wmark_min(void) setup_per_zone_inactive_ratio(); return 0; } -module_init(init_per_zone_wmark_min) +core_initcall(init_per_zone_wmark_min) /* * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so |