Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755130Ab3CFUkP (ORCPT ); Wed, 6 Mar 2013 15:40:15 -0500 Received: from mail-oa0-f47.google.com ([209.85.219.47]:48539 "EHLO mail-oa0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753408Ab3CFUkM (ORCPT ); Wed, 6 Mar 2013 15:40:12 -0500 MIME-Version: 1.0 In-Reply-To: <51377ED7.1060800@zytor.com> References: <20130228205206.GC3438@sgi.com> <512FC697.3090608@zytor.com> <20130228210910.GD3438@sgi.com> <512FC82B.40909@zytor.com> <512FE3AE.4070903@zytor.com> <20130305081519.GA19165@sgi.com> <9bcd6241-37fd-4ae9-a997-2a5da1eaf997@email.android.com> <51377C3A.3030301@zytor.com> <51377ED7.1060800@zytor.com> Date: Wed, 6 Mar 2013 15:40:11 -0500 Message-ID: Subject: Re: Revert commit 5dcd14ecd4 - breaks EFI boot with SLES11 elilo.efi From: Josh Boyer To: "H. Peter Anvin" Cc: Yinghai Lu , Robin Holt , linux-kernel@vger.kernel.org, pjones@redhat.com Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1391 Lines: 34 On Wed, Mar 6, 2013 at 12:37 PM, H. Peter Anvin wrote: > On 03/06/2013 09:36 AM, Josh Boyer wrote: >> >> Something like this? >> >> Index: linux-2.6/arch/x86/include/asm/bootparam_utils.h >> =================================================================== >> --- linux-2.6.orig/arch/x86/include/asm/bootparam_utils.h >> +++ linux-2.6/arch/x86/include/asm/bootparam_utils.h >> @@ -20,8 +20,11 @@ static void sanitize_boot_params(struct >> if (boot_params->sentinel) { >> /*fields in boot_params are not valid, clear them */ >> memset(&boot_params->olpc_ofw_header, 0, >> - (char *)&boot_params->alt_mem_k - >> + (char *)&boot_params->efi_info - >> (char *)&boot_params->olpc_ofw_header); >> memset(&boot_params->kbd_status, 0, >> (char *)&boot_params->hdr - >> (char *)&boot_params->kbd_status); >> >> I can try that in a bit. >> > > Right. OK. Doing that on top of 3.9-rc1 results in me having a booting machine again. I'd suggest we get that into upstream quick-ish. josh -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/