From patchwork Thu Mar 13 22:46:54 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 26227 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DA41203AC for ; Thu, 13 Mar 2014 22:48:46 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf4085138yho.6 for ; Thu, 13 Mar 2014 15:48:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=QS/s4K1ZJVPus0C+8Ir9SlqyGIFuEnplDWoZ231j7lw=; b=W5xoiHkwKAxMO4be42SedowsGYVmFruWBmUqW5CJSX+Te3KLcagIJD2SjlNFmszcWZ +kFDX9Wz0S9Vv9xb+e/AOJnWq9QpfjyLU+flQ5xM+9JMYjEpBX99xPicT/HUIe8JWOO5 sgwCX2/HJtBS7WXMlftR8XZBNvNj9hMANpF07wjSbW6AofZnzmQ7npCYYbIdnzJpayx1 GzFTz6ppIdPL0vPO0IaJkubOXH6aTsmJGQsMWQPvwFGhj06wAgdY2AllOoqaqp1nHRYU 8ad+59vqVVEhQFXutwwZtLBZhw1lW+0/2x1NqNj+VCaDv8tUXO1aKxt+P6Xk8tVbm6kg 9X9Q== X-Gm-Message-State: ALoCoQmKaMOCi5OOe45C/zZ8vXarmP+2Zc36GAqcj3rDXyZygdj5uk1DfzLAPQLNIoiGOjRTOLv1 X-Received: by 10.52.132.177 with SMTP id ov17mr1540950vdb.1.1394750926051; Thu, 13 Mar 2014 15:48:46 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.32.11 with SMTP id g11ls509078qgg.11.gmail; Thu, 13 Mar 2014 15:48:46 -0700 (PDT) X-Received: by 10.52.230.105 with SMTP id sx9mr3003211vdc.10.1394750925962; Thu, 13 Mar 2014 15:48:45 -0700 (PDT) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id s10si1364175vco.131.2014.03.13.15.48.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:48:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.176; Received: by mail-ve0-f176.google.com with SMTP id cz12so1828295veb.7 for ; Thu, 13 Mar 2014 15:48:45 -0700 (PDT) X-Received: by 10.220.164.80 with SMTP id d16mr3434260vcy.15.1394750925876; Thu, 13 Mar 2014 15:48:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.78.9 with SMTP id i9csp10213vck; Thu, 13 Mar 2014 15:48:45 -0700 (PDT) X-Received: by 10.194.185.148 with SMTP id fc20mr3766869wjc.27.1394750924650; Thu, 13 Mar 2014 15:48:44 -0700 (PDT) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id i8si2584909wje.55.2014.03.13.15.48.44 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 15:48:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOEQO-00011s-Bj; Thu, 13 Mar 2014 22:48:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOEQL-00025H-S9; Thu, 13 Mar 2014 22:48:25 +0000 Received: from mail-wg0-f45.google.com ([74.125.82.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WOEQJ-00023i-Hy for linux-arm-kernel@lists.infradead.org; Thu, 13 Mar 2014 22:48:24 +0000 Received: by mail-wg0-f45.google.com with SMTP id l18so1439630wgh.28 for ; Thu, 13 Mar 2014 15:48:01 -0700 (PDT) X-Received: by 10.194.86.233 with SMTP id s9mr3734770wjz.44.1394750880968; Thu, 13 Mar 2014 15:48:00 -0700 (PDT) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id dk9sm9072133wjb.4.2014.03.13.15.47.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Mar 2014 15:48:00 -0700 (PDT) From: Leif Lindholm To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, catalin.marinas@arm.com, matt.fleming@intel.com Subject: [PATCH v2 01/15] efi: delete stray ARM ifdef Date: Thu, 13 Mar 2014 22:46:54 +0000 Message-Id: <1394750828-16351-2-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1394750828-16351-1-git-send-email-leif.lindholm@linaro.org> References: <1394750828-16351-1-git-send-email-leif.lindholm@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140313_184823_704453_9BB351B7 X-CRM114-Status: UNSURE ( 9.75 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.45 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: roy.franz@linaro.org, Leif Lindholm , msalter@redhat.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: leif.lindholm@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 An #ifdef CONFIG_ARM clause in efi-stub-helper.c got included with some of the generic stub rework by Roy Franz. Drop it here to make subsequent patches less confusing. Signed-off-by: Leif Lindholm --- drivers/firmware/efi/efi-stub-helper.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/drivers/firmware/efi/efi-stub-helper.c b/drivers/firmware/efi/efi-stub-helper.c index b6bffbf..6811af7 100644 --- a/drivers/firmware/efi/efi-stub-helper.c +++ b/drivers/firmware/efi/efi-stub-helper.c @@ -608,18 +608,8 @@ static char *efi_convert_cmdline_to_ascii(efi_system_table_t *sys_table_arg, } options_size++; /* NUL termination */ -#ifdef CONFIG_ARM - /* - * For ARM, allocate at a high address to avoid reserved - * regions at low addresses that we don't know the specfics of - * at the time we are processing the command line. - */ - status = efi_high_alloc(sys_table_arg, options_size, 0, - &cmdline_addr, 0xfffff000); -#else - status = efi_low_alloc(sys_table_arg, options_size, 0, - &cmdline_addr); -#endif + + status = efi_low_alloc(sys_table_arg, options_size, 0, &cmdline_addr); if (status != EFI_SUCCESS) return NULL;