Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp883844pxk; Thu, 17 Sep 2020 20:17:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzSgpOH4fW6HaieS/rc1bY2nVYMIHh7RAN5NuAG3K8Z6MTMUMGZlzThWJMwR4GMXrwCz59Z X-Received: by 2002:a05:6402:1779:: with SMTP id da25mr35460961edb.75.1600399045104; Thu, 17 Sep 2020 20:17:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600399045; cv=none; d=google.com; s=arc-20160816; b=NNOY1TkpG9qFZoQKFIiU9aJMHHkSfE33nfnsYiAw8Tmn0teBuGvAPQ5WZcr14AUZE+ bxpNTpr0XmuBfBWvPdwn6dYOM+I3Y/tLsi/6/TP2KhqxMO9cZc5mCHcwU6bOadg/gihN +4F4Kwq0nZkVYaRFBwGHFhSxB/B22gifYLqM1z2dvcLbagDTQNQktydJm7ITEiBm3MR1 aNVLllr0yd13/iYk9UUt+tCz0ddLiRK4IUcn6E1hlU+5VdHjVgTyrvCmiXd4eDtvvmCt pXCMU7mwQjM0PkHNOauyDLIddpTfWIsqQtl2EDa080OJXLiJfdzg3RyFT+ssK+m+KajI wR8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gokeF5MyZqwucYe5ExUPyJ+TbQEcsZW8YU/yC2ORR28=; b=Zm7UJLAuwCJ+gsvmzldht1ypmkr7jLIGpHwgK5tlRPH/mbURc5nV7vq4HJNEAlo3qZ vx1GCwjtky9TR5AqoXYrbmwgn230fI2YoJasCmUB0S2NZC87WNH9DQ/WpO8m7m5+ow48 hdsDpO11JndUsTdHY8NHP/pcou7pJnjoXEmUqoKAcRmbHXILz78paotWT+R7Bdvomxnc xOeRzZmzdIL/Bp50dW8H+bDhMauOgGXhgWtOSl14+pHxfrKkge45rpRT954eWUX2A6Ed D3rN3nRiFnP+hClwZI/DyLsWZUqqyoPHMdlPDEF6KeM2RDibGwji0qYaT/BCDS3aovbf t/2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cl72sP8R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n15si1458711eje.58.2020.09.17.20.17.02; Thu, 17 Sep 2020 20:17:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=cl72sP8R; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730702AbgIRDOK (ORCPT + 99 others); Thu, 17 Sep 2020 23:14:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:46376 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbgIRCBr (ORCPT ); Thu, 17 Sep 2020 22:01:47 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4373921973; Fri, 18 Sep 2020 02:01:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600394506; bh=6cjJOA2M3eiMBSZe3NwpL92h0qu9NZbYN2525X0lxrg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cl72sP8RmhwoX43FoZxZ6r5/gPXVXndjeJ+omttxT2wWkw0dJbstqYS9RQg3pmEm3 pVQRHC3UstXSkwZW1woXtQh/MFOHfyhYCRcSLGFcB4FjgbQBqOAKsBrNgc2sOUwEjA Ru2YdnLiKongJEF03IdDkmwr19CdKTxzD8qKMUWo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 5.4 030/330] powerpc/64s: Always disable branch profiling for prom_init.o Date: Thu, 17 Sep 2020 21:56:10 -0400 Message-Id: <20200918020110.2063155-30-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200918020110.2063155-1-sashal@kernel.org> References: <20200918020110.2063155-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michael Ellerman [ Upstream commit 6266a4dadb1d0976490fdf5af4f7941e36f64e80 ] Otherwise the build fails because prom_init is calling symbols it's not allowed to, eg: Error: External symbol 'ftrace_likely_update' referenced from prom_init.c make[3]: *** [arch/powerpc/kernel/Makefile:197: arch/powerpc/kernel/prom_init_check] Error 1 Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20191106051129.7626-1-mpe@ellerman.id.au Signed-off-by: Sasha Levin --- arch/powerpc/kernel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index dc0780f930d5b..59260eb962916 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -19,6 +19,7 @@ CFLAGS_btext.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) CFLAGS_prom.o += $(DISABLE_LATENT_ENTROPY_PLUGIN) CFLAGS_prom_init.o += $(call cc-option, -fno-stack-protector) +CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING ifdef CONFIG_FUNCTION_TRACER # Do not trace early boot code @@ -36,7 +37,6 @@ KASAN_SANITIZE_btext.o := n ifdef CONFIG_KASAN CFLAGS_early_32.o += -DDISABLE_BRANCH_PROFILING CFLAGS_cputable.o += -DDISABLE_BRANCH_PROFILING -CFLAGS_prom_init.o += -DDISABLE_BRANCH_PROFILING CFLAGS_btext.o += -DDISABLE_BRANCH_PROFILING endif -- 2.25.1