Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1941333iob; Thu, 5 May 2022 11:23:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyjxbaJoAva7qGaHJn0BYEjCG1Pe0CJqQSsLxwCJ6rOpCgm5FhAfaGtVDGCQuX+pC0CFJAh X-Received: by 2002:aa7:8757:0:b0:50d:48a9:f021 with SMTP id g23-20020aa78757000000b0050d48a9f021mr26888781pfo.24.1651774990080; Thu, 05 May 2022 11:23:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651774990; cv=none; d=google.com; s=arc-20160816; b=U/RkVSPmwPPyqchL+oOlAkTYKwARkjOghZQgtcOXq4sSnBg5+m3zOOwalFIraXUBen 7vkQfQ+NaFRE/BweM9bT7cATic79fCpfCE0mw5IY8TOBucNI0yeEdRDGQujLEGi1IDMk eTZytt2Big8lqcfbdNoD2a+2Tk8kj/xV8yNc+0UEn84YBqLm9H51eP3CB4zJz1P8ifBl AX3eIRRIj54DIZQgf2QqnUgKnta1NxwEKHq09spjUeGcAYgx87oBnwzvREAdxW83aVtT xYCtgtYeAxa38hSEgSMvOtB7O2Cu8U+i6cZOViNzxxBP3OKeratLUUQAyfuO6MYP/pqs a6Fw== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=QyYJs/mMprvWMV99WAQBIp+nJ54nBwGeI1x1COSfpzg=; b=K/BdTKCVeq968vhO3MDt0qkhplTPxY91uw96JA0seQEZ64w1YzKe/8LmrXGvuSfFi7 r7qYs4tN5ed5I7LGfLwxJtXdPpOAV15JYkqeGgdINWKnGGqk3ov6QDXIvXuuF+hVLeoL 5jJQ/OsvQhC9dg1FxDBrZR0fNY3cLlqwm41DL3r1mC30dnA0Wxd7EMIMSlLw3A7pY86v 1d7aLYKNA+meBfIsDvY2fMmeDivq7kFr96aqrQB6Q5MwPPsCBCce8WjyjXtGICcW8INo l3urY2bvX6Vv0HYYpJbgoxqjgVnTZXmhY9UtOgR3GDtDr5FXk1edO6alYWIQYrpbkQ2z flDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IOYUAmhy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m189-20020a6258c6000000b0050d4affda05si2204169pfb.214.2022.05.05.11.22.51; Thu, 05 May 2022 11:23:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=IOYUAmhy; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1376614AbiEDRyw (ORCPT + 99 others); Wed, 4 May 2022 13:54:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357366AbiEDRPA (ORCPT ); Wed, 4 May 2022 13:15:00 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17C4454BD5; Wed, 4 May 2022 09:58:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id D95D0616AC; Wed, 4 May 2022 16:58:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8D820C385B3; Wed, 4 May 2022 16:58:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683510; bh=+Rmjm5j+NVCX092c+nELx71iEIRBfHPkU0zB4Hx6TB8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IOYUAmhyUN3mB5VpWa0y0n8nj6u5k3NmLvZuPM3he2YoSRY7rwHrPK4OcR6kUAKwp 0wfLhcAJS8yr0VVcQqRgWgr3O1KNcbT0zg+/uQP8FI90FqEDuW+lw49f5QMGXsK7jc 07ISTyQTOmjxKBPqV8qITfEBXmnryoTcVOmRqgw0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexey Kardashevskiy , Michael Ellerman , Sasha Levin Subject: [PATCH 5.17 173/225] powerpc/perf: Fix 32bit compile Date: Wed, 4 May 2022 18:46:51 +0200 Message-Id: <20220504153125.711968616@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alexey Kardashevskiy [ Upstream commit bb82c574691daf8f7fa9a160264d15c5804cb769 ] The "read_bhrb" global symbol is only called under CONFIG_PPC64 of arch/powerpc/perf/core-book3s.c but it is compiled for both 32 and 64 bit anyway (and LLVM fails to link this on 32bit). This fixes it by moving bhrb.o to obj64 targets. Signed-off-by: Alexey Kardashevskiy Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20220421025756.571995-1-aik@ozlabs.ru Signed-off-by: Sasha Levin --- arch/powerpc/perf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/perf/Makefile b/arch/powerpc/perf/Makefile index 2f46e31c7612..4f53d0b97539 100644 --- a/arch/powerpc/perf/Makefile +++ b/arch/powerpc/perf/Makefile @@ -3,11 +3,11 @@ obj-y += callchain.o callchain_$(BITS).o perf_regs.o obj-$(CONFIG_COMPAT) += callchain_32.o -obj-$(CONFIG_PPC_PERF_CTRS) += core-book3s.o bhrb.o +obj-$(CONFIG_PPC_PERF_CTRS) += core-book3s.o obj64-$(CONFIG_PPC_PERF_CTRS) += ppc970-pmu.o power5-pmu.o \ power5+-pmu.o power6-pmu.o power7-pmu.o \ isa207-common.o power8-pmu.o power9-pmu.o \ - generic-compat-pmu.o power10-pmu.o + generic-compat-pmu.o power10-pmu.o bhrb.o obj32-$(CONFIG_PPC_PERF_CTRS) += mpc7450-pmu.o obj-$(CONFIG_PPC_POWERNV) += imc-pmu.o -- 2.35.1