From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E9AFFC282C0 for ; Fri, 25 Jan 2019 22:40:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B78F2218FF for ; Fri, 25 Jan 2019 22:40:42 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="XkgoP/aR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726689AbfAYWkm (ORCPT ); Fri, 25 Jan 2019 17:40:42 -0500 Received: from mail-qt1-f196.google.com ([209.85.160.196]:42541 "EHLO mail-qt1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726179AbfAYWkm (ORCPT ); Fri, 25 Jan 2019 17:40:42 -0500 Received: by mail-qt1-f196.google.com with SMTP id d19so12466561qtq.9 for ; Fri, 25 Jan 2019 14:40:41 -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=IbhWU+vwiJ4ZGll0liBnsU+9mDwJbLZRs9UYNa4vW7U=; b=XkgoP/aR1ruWtFuzcADA9M/uV3qkMpU6/6QR1J1vNMNRVbLV6ltZi/DHMsgDcH/gXL Uo0o7iujAAtTPqBuzO4FZM79Bc3bimlqSul3wxL7++3Kp4rECSyyOEzTZCl9orAKAqA6 wi0AGJr7iDKywUV4SBSumAjYVta5a+FZiey0E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IbhWU+vwiJ4ZGll0liBnsU+9mDwJbLZRs9UYNa4vW7U=; b=RM5EpEhkZevT2J2unuhcyca4iGoP0iSLXINnF81l09FmtVCNno3roBUd9j1i1vcs+q /UO1XL/T6b1Z0YIxpm8VeFK/XRD9o5eQ7bXbfGrnrq3mT1lvdrW5sO+Qg3H7/mSHX3d0 yL4GW2uD3xq5Tl9NkQd5gExnOUvvFNdn2kVRs3CQ9kTzHooOT9AL9QIc8/wxvJq7KI3S pOSHRpPNjw86bpO7xPYYbS7O/DH44bZldMNUy+LEm1MinuNJvt5B+4B7UPGk+dg1bAfB LVhp2Fro00NyYXl9p4uTpA3rU0r3yQT8Y321LxdercvYIk2vJoPE8bw6CrxHvkSedM7B mIoA== X-Gm-Message-State: AJcUukech4UyKdixL/GBGZcUQw5uNB8ER9ldnXzD7ZkcVhYnTjpVSMRC U1qyY4qRhe7UzHieAhMAHJcn5EzdvK8= X-Google-Smtp-Source: ALg8bN56jqOLb8NE5CElx7PEuwo7dnhERNf+XGXe7tRds01xClvLZ4htvLeUoM1QDg19N2Ht0b5wiQ== X-Received: by 2002:ac8:35eb:: with SMTP id l40mr13249180qtb.165.1548456040639; Fri, 25 Jan 2019 14:40:40 -0800 (PST) Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id q38sm73052296qtj.65.2019.01.25.14.40.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jan 2019 14:40:40 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier Cc: Greg KH , Mark Brown Subject: [PATCH 4.20 1/1] ARM: fix the cockup in the previous patch Date: Fri, 25 Jan 2019 17:40:37 -0500 Message-Id: <20190125224037.4787-2-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190125224037.4787-1-dave.long@linaro.org> References: <20190125224037.4787-1-dave.long@linaro.org> Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit d6951f582cc50ba0ad22ef46b599740966599b14 upstream. The intention in the previous patch was to only place the processor tables in the .rodata section if big.Little was being built and we wanted the branch target hardening, but instead (due to the way it was tested) it ended up always placing the tables into the .rodata section. Although harmless, let's correct this anyway. Fixes: 3a4d0c2172bc ("ARM: ensure that processor vtables is not lost after boot") Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/mm/proc-macros.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 19516fbc2c55..5461d589a1e2 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -278,7 +278,7 @@ * If we are building for big.Little with branch predictor hardening, * we need the processor function tables to remain available after boot. */ -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) .section ".rodata" #endif .type \name\()_processor_functions, #object @@ -316,7 +316,7 @@ ENTRY(\name\()_processor_functions) .endif .size \name\()_processor_functions, . - \name\()_processor_functions -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) .previous #endif .endm -- 2.17.1