These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / mm / memtest.c

diff --git a/kernel/mm/memtest.c b/kernel/mm/memtest.c
index 1997d93..8eaa4c3 100644 (file)
--- a/kernel/mm/memtest.c
+++ b/kernel/mm/memtest.c
@@ -1,11 +1,6 @@
 #include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/string.h>
 #include <linux/types.h>
-#include <linux/mm.h>
-#include <linux/smp.h>
 #include <linux/init.h>
-#include <linux/pfn.h>
 #include <linux/memblock.h>
 
 static u64 patterns[] __initdata = {
@@ -31,10 +26,8 @@ static u64 patterns[] __initdata = {
 
 static void __init reserve_bad_mem(u64 pattern, phys_addr_t start_bad, phys_addr_t end_bad)
 {
-       printk(KERN_INFO "  %016llx bad mem addr %010llx - %010llx reserved\n",
-              (unsigned long long) pattern,
-              (unsigned long long) start_bad,
-              (unsigned long long) end_bad);
+       pr_info("  %016llx bad mem addr %pa - %pa reserved\n",
+               cpu_to_be64(pattern), &start_bad, &end_bad);
        memblock_reserve(start_bad, end_bad - start_bad);
 }
 
@@ -74,30 +67,31 @@ static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end)
        u64 i;
        phys_addr_t this_start, this_end;
 
-       for_each_free_mem_range(i, NUMA_NO_NODE, &this_start, &this_end, NULL) {
+       for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &this_start,
+                               &this_end, NULL) {
                this_start = clamp(this_start, start, end);
                this_end = clamp(this_end, start, end);
                if (this_start < this_end) {
-                       printk(KERN_INFO "  %010llx - %010llx pattern %016llx\n",
-                              (unsigned long long)this_start,
-                              (unsigned long long)this_end,
-                              (unsigned long long)cpu_to_be64(pattern));
+                       pr_info("  %pa - %pa pattern %016llx\n",
+                               &this_start, &this_end, cpu_to_be64(pattern));
                        memtest(pattern, this_start, this_end - this_start);
                }
        }
 }
 
 /* default is disabled */
-static int memtest_pattern __initdata;
+static unsigned int memtest_pattern __initdata;
 
 static int __init parse_memtest(char *arg)
 {
+       int ret = 0;
+
        if (arg)
-               memtest_pattern = simple_strtoul(arg, NULL, 0);
+               ret = kstrtouint(arg, 0, &memtest_pattern);
        else
                memtest_pattern = ARRAY_SIZE(patterns);
 
-       return 0;
+       return ret;
 }
 
 early_param("memtest", parse_memtest);
@@ -110,7 +104,7 @@ void __init early_memtest(phys_addr_t start, phys_addr_t end)
        if (!memtest_pattern)
                return;
 
-       printk(KERN_INFO "early_memtest: # of tests: %d\n", memtest_pattern);
+       pr_info("early_memtest: # of tests: %u\n", memtest_pattern);
        for (i = memtest_pattern-1; i < UINT_MAX; --i) {
                idx = i % ARRAY_SIZE(patterns);
                do_one_pass(patterns[idx], start, end);