From patchwork Thu Feb 4 08:31:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 61161 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp325915lbl; Thu, 4 Feb 2016 00:33:47 -0800 (PST) X-Received: by 10.66.185.225 with SMTP id ff1mr9012695pac.97.1454574826965; Thu, 04 Feb 2016 00:33:46 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id 76si15263011pfk.107.2016.02.04.00.33.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Feb 2016 00:33:46 -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 1aRFKp-0006vc-Va; Thu, 04 Feb 2016 08:32:15 +0000 Received: from mail-wm0-x234.google.com ([2a00:1450:400c:c09::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aRFKn-0006ng-EG for linux-arm-kernel@lists.infradead.org; Thu, 04 Feb 2016 08:32:14 +0000 Received: by mail-wm0-x234.google.com with SMTP id p63so105799028wmp.1 for ; Thu, 04 Feb 2016 00:31:53 -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; bh=H1UK0Ha554Lgr10M5uXjdT1rLJPxch7PTfrnaQ8AW+E=; b=URK2ftMR3SDPLCfTu4tXSSHr5qi9Hb+7+CvusnuysQPcHZuGRq6KzC8q2+rbWrTUq2 hb8CSfSEtWxSnPN2OBXHnDylpdqiHLoHRqaNkncBJ/ZTacG6J/Q9PmXF0WGUr2+WjEtP ufkSmIftQBxaVII56bVZh57tgULwG0xgVwdlE= 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; bh=H1UK0Ha554Lgr10M5uXjdT1rLJPxch7PTfrnaQ8AW+E=; b=DQpeVfiq5CnZFEJs8WTiX8AjT2lqktbBLmlZOge64UN1eVSXYl8A3QZ1+RNSpfJwhs IJybP44ZbzZhoBbBxLJQpFzDEpoNJtpi+z8nIJRa+5f6eE7defnYHcF+4xD50O0e/kDP lnWE/GF2PEe0BaTkeGMHsmDH3Ihh2QVAMmv6Q3/vUsd6r7QZ7MRX9mM39WDhqfw3tiD/ 8+TTRBkhVUzxEocilUSzIOiWBCLAgx053r5tWtJDhMdAl9J7dwWfR7lr/M+KjXujx3wR MYAhCrcAy7OpDVc7wKnOw+aa0N3gbuY4k8oir7YkSq7hBoOWXL2JQ8uREkJFa6S+RQqk z6/w== X-Gm-Message-State: AG10YOS4sD+LX5DGFeyeAYtvvLJbdR5k8Zsb5ulcCMXLRwZg1CKpis3uaMGfpWx7qswJVT7e X-Received: by 10.28.175.147 with SMTP id y141mr8478823wme.64.1454574712024; Thu, 04 Feb 2016 00:31:52 -0800 (PST) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id 67sm25311451wmp.20.2016.02.04.00.31.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 04 Feb 2016 00:31:51 -0800 (PST) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux@arm.linux.org.uk Subject: [PATCH] ARM: remove duplicate definitions of __vectors_start and __stubs_start Date: Thu, 4 Feb 2016 09:31:45 +0100 Message-Id: <1454574705-15109-1-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160204_003213_633086_79D39372 X-CRM114-Status: GOOD ( 12.40 ) 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:234 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 Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 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: Ard Biesheuvel , arnd@arndb.de, nico@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org Commit b9b32bf70f2f ("ARM: use linker magic for vectors and vector stubs") introduced new global definitions of __vectors_start and __stubs_start, and changed the existing ones to have internal linkage only. However, these symbols are still visible to kallsyms, and due to the way the .vectors and .stubs sections are emitted at the base of the VMA space, these duplicate definitions have conflicting values. $ nm -n vmlinux |grep -E __vectors\|__stubs 00000000 t __vectors_start 00001000 t __stubs_start c0e77000 T __vectors_start c0e77020 T __stubs_start This is completely harmless by itself, since the wrong values are local symbols that cannot be referenced by other object files directly. However, since these symbols are also listed in the kallsyms symbol table in some cases (i.e., CONFIG_KALLSYMS_ALL=y and CONFIG_XIP_KERNEL=y), having these conflicting values can be confusing. So either remove them, or make them strictly local. Signed-off-by: Ard Biesheuvel --- This is a separate fix for the duplicate symbols based on v4.5-rc2, so that it can be applied separately if desired. In that case, I will rebase my kallsyms series onto this patch. arch/arm/kernel/entry-armv.S | 5 ++--- 1 file changed, 2 insertions(+), 3 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: Nicolas Pitre diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 3ce377f7251f..788e40c1254f 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -1064,7 +1064,6 @@ ENDPROC(vector_\name) .endm .section .stubs, "ax", %progbits -__stubs_start: @ This must be the first word .word vector_swi @@ -1206,10 +1205,10 @@ vector_addrexcptn: .equ vector_fiq_offset, vector_fiq .section .vectors, "ax", %progbits -__vectors_start: +.L__vectors_start: W(b) vector_rst W(b) vector_und - W(ldr) pc, __vectors_start + 0x1000 + W(ldr) pc, .L__vectors_start + 0x1000 W(b) vector_pabt W(b) vector_dabt W(b) vector_addrexcptn