diff --git a/[refs] b/[refs] index c05251daac8f..da5df29ec7fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1a8e7792047f7dca7eb5759250e2c12800bf262 +refs/heads/master: c77a3b59c624454c501cbfa1a3611d5a00bf9532 diff --git a/trunk/arch/x86/mm/init.c b/trunk/arch/x86/mm/init.c index 6d63e3d1253d..15219e0d1243 100644 --- a/trunk/arch/x86/mm/init.c +++ b/trunk/arch/x86/mm/init.c @@ -134,8 +134,8 @@ unsigned long __init_refok init_memory_mapping(unsigned long start, { unsigned long page_size_mask = 0; unsigned long start_pfn, end_pfn; + unsigned long ret = 0; unsigned long pos; - unsigned long ret; struct map_range mr[NR_RANGE_MR]; int nr_range, i; diff --git a/trunk/arch/x86/mm/memtest.c b/trunk/arch/x86/mm/memtest.c index 605c8be06217..0bcd7883d036 100644 --- a/trunk/arch/x86/mm/memtest.c +++ b/trunk/arch/x86/mm/memtest.c @@ -100,9 +100,6 @@ static int __init parse_memtest(char *arg) { if (arg) memtest_pattern = simple_strtoul(arg, NULL, 0); - else - memtest_pattern = ARRAY_SIZE(patterns); - return 0; }