diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-11-03 23:42:16 +0100 |
| commit | 23a12ddee1ce28065b71f14ccc695b5a0c8a64ff (patch) | |
| tree | cedaa1cde5b2557116e523c31552187804704093 /mm/page_idle.c | |
| parent | 98f76206b33504b934209d16196477dfa519a807 (diff) | |
| parent | bcb6fb5da77c2a228adf07cc9cb1a0c2aa2001c6 (diff) | |
Merge branch 'core/urgent' into x86/urgent, to pick up objtool fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'mm/page_idle.c')
| -rw-r--r-- | mm/page_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/page_idle.c b/mm/page_idle.c index 6302bc62c27d6..b9e4b42b33aba 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/init.h> -#include <linux/bootmem.h> +#include <linux/memblock.h> #include <linux/fs.h> #include <linux/sysfs.h> #include <linux/kobject.h> |