From patchwork Thu Jan 28 11:07:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 60711 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp402719lbb; Thu, 28 Jan 2016 03:09:26 -0800 (PST) X-Received: by 10.98.79.140 with SMTP id f12mr3618056pfj.102.1453979366436; Thu, 28 Jan 2016 03:09:26 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id ik8si16243938pac.235.2016.01.28.03.09.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Jan 2016 03:09:26 -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 1aOkR2-0007UT-Ge; Thu, 28 Jan 2016 11:08:20 +0000 Received: from mail-wm0-x22b.google.com ([2a00:1450:400c:c09::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aOkQl-0006zj-2v for linux-arm-kernel@lists.infradead.org; Thu, 28 Jan 2016 11:08:05 +0000 Received: by mail-wm0-x22b.google.com with SMTP id p63so19374181wmp.1 for ; Thu, 28 Jan 2016 03:07:43 -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=0y7jnU5xtqYYxrNlSDGdxiy1jnExF04SPAYsTimjpyU=; b=KyD82EHmLWAghIYQ0BGnE8XAU6Z5QbkprXr8TycH00xrpNlmOsQWwHuK2Xraf2gpH+ G3WQKS7C2oJYYvuuZcUX0pv+tTU1yzJ11QGwZq7lwYVKmGq5OY50N54jlyZIMPD6pFQX pa6TkZTgQ5M8bdhyiDuSFbXj5vnN4R4R8btII= 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=0y7jnU5xtqYYxrNlSDGdxiy1jnExF04SPAYsTimjpyU=; b=hcIIKf8vfGj8YDYIbfNUfmFbDUXxt74CEZ22C/61cVFgDVUim3FDy2QU1aHr4YK1Ir w0gkQo7u/tIjSkjNgNkrziGlcdYircGw9gobZeNBxshlvA+6sTKYPF5jNdmR1V1ccuxF 4WvH/lzNhWSkL4zc2LBZlg6kQU/hKwrjYo5imIGC+dHLvHvYwds3dt2GOgm11VM7fOrS vrYgoMpAoSWffBpPLVsahrScSWf32Pu9scLemaJfs7GVCx3I2CF09PhoyQkPRvOQXwRe otcARPk1JrRomf9qqHrXi4QVTHbOM5c/ETrbdGNl5VOTUqGeu0teJEbzfqgoQfZ5y6yW Q4GQ== X-Gm-Message-State: AG10YOQ6B3Pu1yg9Dm+DUn6u/7hXBmP8RKwu1j8c49a+sVxWX7RaVx7LjY1qHs+4Qo+5xbPf X-Received: by 10.28.232.208 with SMTP id f77mr2538801wmi.34.1453979262704; Thu, 28 Jan 2016 03:07:42 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id c203sm2360854wmd.5.2016.01.28.03.07.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 28 Jan 2016 03:07:41 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, leif.lindholm@linaro.org, matt@codeblueprint.co.uk Subject: [PATCH 1/3] arm64: efistub: drop __init annotation from handle_kernel_image() Date: Thu, 28 Jan 2016 12:07:32 +0100 Message-Id: <1453979254-25374-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1453979254-25374-1-git-send-email-ard.biesheuvel@linaro.org> References: <1453979254-25374-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160128_030803_413233_9B5688F9 X-CRM114-Status: GOOD ( 10.79 ) X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.7 points) 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:22b 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, catalin.marinas@arm.com, will.deacon@arm.com, Ard Biesheuvel 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. 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 Acked-by: Will Deacon 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;