The patch titled OLPC: only check for OFW signature on VSA-less Geodes has been removed from the -mm tree. Its filename was x86-olpc-add-one-laptop-per-child-architecture-support-fix-3.patch This patch was dropped because it was folded into x86-olpc-add-one-laptop-per-child-architecture-support.patch The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: OLPC: only check for OFW signature on VSA-less Geodes From: Andres Salomon <dilinger@xxxxxxxxxx> The OFW sig check requires an ioremap that is dangerous on non-OLPC systems. Long term, we should be getting the signature from the device tree (/openprom/model), but for right now just limit the check to only run on a subset of Geode (GX2/LX) systems. Signed-off-by: Andres Salomon <dilinger@xxxxxxxxxx> Cc: Andres Salomon <dilinger@xxxxxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxx> Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Acked-by: Jordan Crouse <jordan.crouse@xxxxxxx> Acked-By: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- arch/x86/kernel/olpc.c | 4 ++++ 1 file changed, 4 insertions(+) diff -puN arch/x86/kernel/olpc.c~x86-olpc-add-one-laptop-per-child-architecture-support-fix-3 arch/x86/kernel/olpc.c --- a/arch/x86/kernel/olpc.c~x86-olpc-add-one-laptop-per-child-architecture-support-fix-3 +++ a/arch/x86/kernel/olpc.c @@ -211,6 +211,10 @@ static int __init olpc_init(void) { unsigned char *romsig; + /* The ioremap check is dangerous; limit what we run it on */ + if (!is_geode() || geode_has_vsa2()) + return 0; + spin_lock_init(&ec_lock); romsig = ioremap(0xffffffc0, 16); _ Patches currently in -mm which might be from dilinger@xxxxxxxxxx are origin.patch x86-olpc-add-one-laptop-per-child-architecture-support.patch x86-olpc-add-one-laptop-per-child-architecture-support-fix-3.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