From patchwork Thu Feb 4 15:50:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 61207 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp536938lbl; Thu, 4 Feb 2016 07:54:19 -0800 (PST) X-Received: by 10.66.54.78 with SMTP id h14mr11906752pap.59.1454601259160; Thu, 04 Feb 2016 07:54:19 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id d26si17463978pfb.137.2016.02.04.07.54.18 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2016 07:54:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro.org Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRMDa-00067x-Js; Thu, 04 Feb 2016 15:53:14 +0000 Received: from casper.infradead.org ([85.118.1.10]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRMCo-0005IV-T0 for linux-arm-kernel@bombadil.infradead.org; Thu, 04 Feb 2016 15:52:27 +0000 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]) by casper.infradead.org with esmtps (Exim 4.85 #2 (Red Hat Linux)) id 1aRMBR-0008Eo-0K for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2016 15:51:02 +0000 Received: by mail-wm0-x22e.google.com with SMTP id g62so10716154wme.0 for ; Thu, 04 Feb 2016 07:50:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R734iQK6lC7pjD2jZjVny+QT/dJs9shxrN3FKBoZr9Y=; b=ErrnlfAAcLe2Js6vprfGsHab/oM04vS8PdnL24qWc6RgkKTTAWrWzYY1jHcRvXDlox Jk1XqMwhwEfxGoOxsMtd6ZFn+MnwZdKJ8lThJCODkXIGGtVILmR1s8BLqMmQX6LCDzEk 02T0TxZC7vMg0BNzWZUdn8y675WCzqhYOQ5UQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R734iQK6lC7pjD2jZjVny+QT/dJs9shxrN3FKBoZr9Y=; b=ZiZ2bcx0ssahMcFEuoZ0qkWL9sYaPlrAtAWN9vx0c5XO/KbbtlQNsSmJ1oQ3q6c4hX T0jXUnCqYv1uOFFF+Mp0s2e0GBYdVHdsKJCQR7Ts0eMfjfEXZnrivX/4GVi81fxalk6d 9ClQCHKXRaf9SdYZDTHfueF0JGZlxAE8sPlQ9DdAK53+h98amJXf1Sd9n4EZU7jJFwKe 3WcRZvy1LhTXblEUGPq9N+AOWiQ9lPIGKlDaUSAuXxHdFmWdppFbyhrS9Qrsa7Ih6GDr EWb40twps9LBvK4GNJ4KfsS2ibOtiZbc/RO8MMSZHmYf2q0CDy3GircvHjoM+qyHR74B YEqg== X-Gm-Message-State: AG10YOQpN0VgyFdT/sQpcFPYNnLwp04ZSRFJtMFiumebpMpAt8VoeC7H4TDQneLuTZQs+hdF X-Received: by 10.194.192.170 with SMTP id hh10mr9674460wjc.69.1454601039385; Thu, 04 Feb 2016 07:50:39 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id q73sm26885838wmb.1.2016.02.04.07.50.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Feb 2016 07:50:38 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-efi@vger.kernel.org, matt@codeblueprint.co.uk, catalin.marinas@arm.com Subject: [PATCH v2 1/7] arm64: efistub: drop __init annotation from handle_kernel_image() Date: Thu, 4 Feb 2016 16:50:24 +0100 Message-Id: <1454601030-9093-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454601030-9093-1-git-send-email-ard.biesheuvel@linaro.org> References: <1454601030-9093-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160204_155101_079533_3F73EFA9 X-CRM114-Status: GOOD ( 10.19 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on casper.infradead.org summary: Content analysis details: (-2.7 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:400c:c09:0:0:0:22e 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] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, Ard Biesheuvel , will.deacon@arm.com, jeremy.linton@arm.com, suzuki.poulose@arm.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org After moving arm64-stub.c to libstub/, all of its sections are emitted as .init.xxx sections automatically, and the __init annotation of handle_kernel_image() causes it to end up in .init.init.text, which is not recognized as an __init section by the linker scripts. So drop the annotation. Acked-by: Will Deacon Acked-by: Mark Rutland Tested-by: Mark Rutland Signed-off-by: Ard Biesheuvel --- drivers/firmware/efi/libstub/arm64-stub.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.5.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c index 78dfbd34b6bf..9e0342745e4f 100644 --- a/drivers/firmware/efi/libstub/arm64-stub.c +++ b/drivers/firmware/efi/libstub/arm64-stub.c @@ -13,13 +13,13 @@ #include #include -efi_status_t __init handle_kernel_image(efi_system_table_t *sys_table_arg, - unsigned long *image_addr, - unsigned long *image_size, - unsigned long *reserve_addr, - unsigned long *reserve_size, - unsigned long dram_base, - efi_loaded_image_t *image) +efi_status_t handle_kernel_image(efi_system_table_t *sys_table_arg, + unsigned long *image_addr, + unsigned long *image_size, + unsigned long *reserve_addr, + unsigned long *reserve_size, + unsigned long dram_base, + efi_loaded_image_t *image) { efi_status_t status; unsigned long kernel_size, kernel_memsize = 0;