diff options
| author |  Ingo Molnar <mingo@kernel.org>
| 2015-08-25 09:59:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org>
| 2015-08-25 09:59:19 +0200 |
| commit | 8d58b66ed2b000f27658c88a4ed70e8042e86a58 (patch) | |
| tree | 5bae2c74f932b5d863f72cb698a6f71260340b26 /arch/x86/kernel/check.c | |
| parent | x86/mm: Make kernel/check.c explicitly non-modular (diff) | |
| parent | Linux 4.2-rc8 (diff) | |
| download | linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.tar.gz linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.tar.bz2 linux-8d58b66ed2b000f27658c88a4ed70e8042e86a58.zip | |
Merge tag 'v4.2-rc8' into x86/mm, before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/check.c')
| -rw-r--r-- | arch/x86/kernel/check.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/check.c b/arch/x86/kernel/check.c index f40cfd12ba66..145863d4d343 100644 --- a/arch/x86/kernel/check.c +++ b/arch/x86/kernel/check.c @@ -91,7 +91,8 @@ void __init setup_bios_corruption_check(void) corruption_check_size = round_up(corruption_check_size, PAGE_SIZE); - for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL) { + for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &start, &end, + NULL) { start = clamp_t(phys_addr_t, round_up(start, PAGE_SIZE), PAGE_SIZE, corruption_check_size); end = clamp_t(phys_addr_t, round_down(end, PAGE_SIZE), |