From patchwork Mon Dec 3 20:02:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1834991 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id A369C40E42 for ; Mon, 3 Dec 2012 20:03:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752123Ab2LCUCt (ORCPT ); Mon, 3 Dec 2012 15:02:49 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:52015 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752053Ab2LCUCr (ORCPT ); Mon, 3 Dec 2012 15:02:47 -0500 Received: from 64-126-113-183.dyn.everestkc.net ([64.126.113.183] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TfcDz-0001Ff-U8; Mon, 03 Dec 2012 20:02:44 +0000 Date: Mon, 3 Dec 2012 14:02:41 -0600 From: Seth Forshee To: Bjorn Helgaas Cc: Matthew Garrett , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-efi@vger.kernel.org, mfleming@intel.com, dwmw2@infradead.org Subject: Re: Use PCI ROMs from EFI boot services Message-ID: <20121203200241.GG5906@thinkpad-t410> Mail-Followup-To: Bjorn Helgaas , Matthew Garrett , linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, linux-efi@vger.kernel.org, mfleming@intel.com, dwmw2@infradead.org References: <1345739803-21017-1-git-send-email-mjg@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org On Thu, Oct 25, 2012 at 11:35:57AM -0600, Bjorn Helgaas wrote: > On Thu, Aug 23, 2012 at 10:36 AM, Matthew Garrett wrote: > > V3 just fixes all the casting issues and incorporates David's change in > > search ordering. > > I think there's still a section mismatch issue with these patches, so > I haven't merged them yet. > > I rebased my pci/mjg-pci-roms-from-efi branch to v3.7-rc2, and if we > get this issue fixed I'll put it in -next as v3.8 material. I still don't see this series in -next, so I take it the section mismatch was never fixed? How about the following? Thanks, Seth From ece31852159a6b2cf9a059031638354e9817a6a6 Mon Sep 17 00:00:00 2001 From: Seth Forshee Date: Mon, 3 Dec 2012 13:55:50 -0600 Subject: [PATCH] x86: Don't discard boot_params boot_params is now used at runtime on EFI systems to stash option ROMs that aren't available after exiting boot services, so it can no longer be marked __initdata. Signed-off-by: Seth Forshee --- arch/x86/kernel/setup.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 468e98d..6e13035 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -143,11 +143,7 @@ int default_check_phys_apicid_present(int phys_apicid) } #endif -#ifndef CONFIG_DEBUG_BOOT_PARAMS -struct boot_params __initdata boot_params; -#else struct boot_params boot_params; -#endif /* * Machine setup..