From patchwork Wed Feb 17 12:35:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Fleming X-Patchwork-Id: 62107 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp2258385lbl; Wed, 17 Feb 2016 04:39:29 -0800 (PST) X-Received: by 10.66.255.39 with SMTP id an7mr1815731pad.2.1455712769177; Wed, 17 Feb 2016 04:39:29 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p90si1740027pfi.232.2016.02.17.04.39.28; Wed, 17 Feb 2016 04:39:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=pass header.i=@codeblueprint-co-uk.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934559AbcBQMj1 (ORCPT + 30 others); Wed, 17 Feb 2016 07:39:27 -0500 Received: from mail-wm0-f41.google.com ([74.125.82.41]:36105 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422660AbcBQMgQ (ORCPT ); Wed, 17 Feb 2016 07:36:16 -0500 Received: by mail-wm0-f41.google.com with SMTP id g62so157699700wme.1 for ; Wed, 17 Feb 2016 04:36:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=codeblueprint-co-uk.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LrRl1iGIpDibsKcjT2aAXIFfyZwuu/xazAyry0RJsVY=; b=Zq+Dgxi+4Exr0thgFp0TDKbBmNsakrqYUrK1W1VBajk6O5+Q4mKYNsy5W2nHrKMGGO 7v6bre4xt7IyCvi8fbCS3SQYsj5BQ+6LlUod2ptwbICGjFgzWwtPnsBSlxHkKskaNQDQ vOoqG/KP8ugqYSTvK1q4fiCRSL+Tt1YuRW9/wi8lMzbCIpHbdbsU7ku+9h/G2o0Ase+Y aIj7hzrFgX1ZPt8HSxRmQwzr0CTdQWjOsFqEVmkGfjiIm4D2tNnwpSHFBb2ofiZ7d26e oNxN+/67sq57recc4wz5+aVfPfCpZ5tVUN/eF4aNbCg0mFJbC/9BfmC7MVc3mQR7t2UL shRg== 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=LrRl1iGIpDibsKcjT2aAXIFfyZwuu/xazAyry0RJsVY=; b=C0Zxjfnbh2L4WuVJAugb35FikYVOaVWRhF8hCzB3XRUa3Nv1JwWgonugD2exVSMkD+ Ltn8+paCzxfPTP5Tn3LwNJF/gawNeaqUFnvhnC7iC3o0c3uXNcHoQP5RX3mn7Q6EGLFF pBm+bydoXD/j+DWSJEbZIjbZIL+OH/m4TK6EwdGrYE8cwjZhjiJ3gWYU94fC855Jyzm8 fF0YKk5eaWVxu/FDiN6JmLfpAFNkBih7wX3w6U9XZKHoH/wR0NZNzeK1I0EqGRqW+lsF 8fibJiPaR2NpSQ97v8IgQcnYTBo95hRroEwIrnkh6I2PkQJrx7RX7ux9EshKoZgAavB/ LYyg== X-Gm-Message-State: AG10YORQ/I4mEAzDBRZTd632mzMNMXbJST/cj0seHo+CqkvW/vC+8mN447nIkUll5E3/Dw== X-Received: by 10.28.156.73 with SMTP id f70mr3690763wme.52.1455712574957; Wed, 17 Feb 2016 04:36:14 -0800 (PST) Received: from localhost (5ec16434.skybroadband.com. [94.193.100.52]) by smtp.gmail.com with ESMTPSA id e77sm25436940wma.18.2016.02.17.04.36.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 17 Feb 2016 04:36:14 -0800 (PST) From: Matt Fleming To: Ingo Molnar , Thomas Gleixner , "H . Peter Anvin" Cc: Ard Biesheuvel , linux-kernel@vger.kernel.org, linux-efi@vger.kernel.org, Matt Fleming , Mark Rutland , Will Deacon Subject: [PATCH 04/13] efi/arm64: Drop __init annotation from handle_kernel_image() Date: Wed, 17 Feb 2016 12:35:57 +0000 Message-Id: <1455712566-16727-5-git-send-email-matt@codeblueprint.co.uk> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1455712566-16727-1-git-send-email-matt@codeblueprint.co.uk> References: <1455712566-16727-1-git-send-email-matt@codeblueprint.co.uk> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Ard Biesheuvel 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 Signed-off-by: Matt Fleming --- drivers/firmware/efi/libstub/arm64-stub.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.6.2 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;