diff options
Diffstat (limited to 'arch/x86/mm/memtest.c')
| -rw-r--r-- | arch/x86/mm/memtest.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/mm/memtest.c b/arch/x86/mm/memtest.c index 18d244f70205..92faf3a1c53e 100644 --- a/arch/x86/mm/memtest.c +++ b/arch/x86/mm/memtest.c | |||
| @@ -6,8 +6,7 @@ | |||
| 6 | #include <linux/smp.h> | 6 | #include <linux/smp.h> |
| 7 | #include <linux/init.h> | 7 | #include <linux/init.h> |
| 8 | #include <linux/pfn.h> | 8 | #include <linux/pfn.h> |
| 9 | 9 | #include <linux/memblock.h> | |
| 10 | #include <asm/e820.h> | ||
| 11 | 10 | ||
| 12 | static u64 patterns[] __initdata = { | 11 | static u64 patterns[] __initdata = { |
| 13 | 0, | 12 | 0, |
| @@ -35,7 +34,7 @@ static void __init reserve_bad_mem(u64 pattern, u64 start_bad, u64 end_bad) | |||
| 35 | (unsigned long long) pattern, | 34 | (unsigned long long) pattern, |
| 36 | (unsigned long long) start_bad, | 35 | (unsigned long long) start_bad, |
| 37 | (unsigned long long) end_bad); | 36 | (unsigned long long) end_bad); |
| 38 | reserve_early(start_bad, end_bad, "BAD RAM"); | 37 | memblock_x86_reserve_range(start_bad, end_bad, "BAD RAM"); |
| 39 | } | 38 | } |
| 40 | 39 | ||
| 41 | static void __init memtest(u64 pattern, u64 start_phys, u64 size) | 40 | static void __init memtest(u64 pattern, u64 start_phys, u64 size) |
| @@ -74,7 +73,7 @@ static void __init do_one_pass(u64 pattern, u64 start, u64 end) | |||
| 74 | u64 size = 0; | 73 | u64 size = 0; |
| 75 | 74 | ||
| 76 | while (start < end) { | 75 | while (start < end) { |
| 77 | start = find_e820_area_size(start, &size, 1); | 76 | start = memblock_x86_find_in_range_size(start, &size, 1); |
| 78 | 77 | ||
| 79 | /* done ? */ | 78 | /* done ? */ |
| 80 | if (start >= end) | 79 | if (start >= end) |
