The patch titled
x86: fix handling of the 'reservetop' boot option
has been added to the -mm tree. Its filename is
x86-fix-handling-of-the-reservetop-boot-option.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: x86: fix handling of the 'reservetop' boot option
From: Liang Li <liang.li@xxxxxxxxxxxxx>
When specifying the 'reservetop=0xbadc0de' kernel parameter, the kernel
will stop booting due to a early_ioremap bug that relate to commit
8827247ff ("x86: don't define __this_fixmap_does_not_exist()").
The root cause of boot failure problem is the value of 'slot_virt[i]' was
initialized in setup_arch->early_ioremap_init. But later in setup_arch,
the function 'parse_early_param' will modify 'FIXADDR_TOP' when
'reservetop=0xbadc0de' being specified.
The simplest fix might be use __fix_to_virt(idx0) to get updated value
of 'FIXADDR_TOP' in '__early_ioremap' instead of reference old value
from slot_virt[slot] directly.
Signed-off-by: Liang Li <liang.li@xxxxxxxxxxxxx>
Cc: Wang Chen <wangchen@xxxxxxxxxxxxxx>
Cc: Ingo Molnar <mingo@xxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: "H. Peter Anvin" <hpa@xxxxxxxxx>
Cc: Yinghai Lu <yinghai@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86/mm/ioremap.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN arch/x86/mm/ioremap.c~x86-fix-handling-of-the-reservetop-boot-option arch/x86/mm/ioremap.c
--- a/arch/x86/mm/ioremap.c~x86-fix-handling-of-the-reservetop-boot-option
+++ a/arch/x86/mm/ioremap.c
@@ -537,9 +537,9 @@ __early_ioremap(resource_size_t phys_add
--nrpages;
}
if (early_ioremap_debug)
- printk(KERN_CONT "%08lx + %08lx\n", offset, slot_virt[slot]);
+ printk(KERN_CONT "%08lx + %08lx\n", offset, __fix_to_virt(idx0));
- prev_map[slot] = (void __iomem *)(offset + slot_virt[slot]);
+ prev_map[slot] = (void __iomem *)(offset + __fix_to_virt(idx0));
return prev_map[slot];
}
_
Patches currently in -mm which might be from liang.li@xxxxxxxxxxxxx are
x86-fix-handling-of-the-reservetop-boot-option.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
