Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp2944722iog; Mon, 20 Jun 2022 08:01:30 -0700 (PDT) X-Google-Smtp-Source: AGRyM1t5G4w2jFzSySVm4l1X+GYClJT+2cj3SURdIo/ISEMvL8IfCyHACnqNCv7wcYT3G4S+L46p X-Received: by 2002:a05:6a00:1a0c:b0:523:1a23:957f with SMTP id g12-20020a056a001a0c00b005231a23957fmr25009378pfv.45.1655737289844; Mon, 20 Jun 2022 08:01:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1655737289; cv=none; d=google.com; s=arc-20160816; b=avn6iJivI17ouPkG1Bnn99OiZMi9l3bArvRqIO3vaqJP57GOcs/FsLCZp2KT/O1SW+ oOyaM9ty81WD8LgBEymXwXxottkLdYx02BhBMUcmEa40p/RZW/80s3bD9l3JEM8qQ8Nw pR06HVVZu1rhkRQl3zUKBTttIvIgwHz4X5FNd3AiecC7RQ37ODXDemnCtIBLD1k8gkh2 lrF9nuROssU29cCRCP6pBnsda+IC+Ypq7SJcF27ufpTfUya35R7qM5fiHr9dgHKrP51v pEHZrg4R9gN6esW8X42ZuCZF6P41ck7ViAMV9lv2nkXmC/AeoUMtF2qggZdbnik25tTE WNzQ== 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=XHwTPO9dp/hCicE44YlhWOncAM3zz45t0+fnP7CDfhU=; b=M0walqYmsWpwnrXoa3khgPkbFU51hMJX3jWlKqippIGDbWeEBHIzTo9zXAo9PGUhRO eEPYKtOpn+wZdY5twtNjfQE4sPZWsnVzXCtKarC4M2dgKQMkKUSQpLCuh/SzcOHO0ihL 01jmvwheStsErHVGngnnZOlNT7J82fvu8mo+XWuNG3LWQtH2D66uP94y6ByEEhG08WRK rt0e+HDXBqWIPXPF399RzeztQLJwvFUJZMCHyKIIdBk80gHu7RRAQInVIxCadhZgYXEP 89sL3QFfUrcLMnJ58reYOQ6Sc3m5V7skEymPcN1fROvG/uXBoH9c9ppBhFEx/L1uA51v hcAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=UoXkTjXB; 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 j6-20020a636e06000000b003fd9e43f9bfsi15628959pgc.393.2022.06.20.08.01.16; Mon, 20 Jun 2022 08:01:29 -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=UoXkTjXB; 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 S243628AbiFTNsG (ORCPT + 99 others); Mon, 20 Jun 2022 09:48:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348893AbiFTNrZ (ORCPT ); Mon, 20 Jun 2022 09:47:25 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 114722E084; Mon, 20 Jun 2022 06:17:33 -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 ams.source.kernel.org (Postfix) with ESMTPS id CC5F4B811CB; Mon, 20 Jun 2022 13:17:23 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08C6EC3411B; Mon, 20 Jun 2022 13:17:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1655731042; bh=bGEyYtbZs2EMcJdC+qe7X9Ls+GlfrYnEojWdFuENIgk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UoXkTjXBzasLW0S1qhd3Fl59BVvPZQTWxc7+sxACN1Gc2Emvl4dRsrBzfZCBMs6Gd W/QBvwanbsUXcBSgfDDY2Vn+wnuVfILhFsxxsqFs1bN1gwwMxWGPuUtJTWNqXqfLgl G7OZIL2rb7VQqXrrlZzJOcW2cg67e6SqfxrJzWTQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , Arnd Bergmann , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , "Jason A. Donenfeld" Subject: [PATCH 5.4 135/240] powerpc: define get_cycles macro for arch-override Date: Mon, 20 Jun 2022 14:50:36 +0200 Message-Id: <20220620124742.920621228@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220620124737.799371052@linuxfoundation.org> References: <20220620124737.799371052@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: "Jason A. Donenfeld" commit 408835832158df0357e18e96da7f2d1ed6b80e7f upstream. PowerPC defines a get_cycles() function, but it does not do the usual `#define get_cycles get_cycles` dance, making it impossible for generic code to see if an arch-specific function was defined. While the get_cycles() ifdef is not currently used, the following timekeeping patch in this series will depend on the macro existing (or not existing) when defining random_get_entropy(). Cc: Thomas Gleixner Cc: Arnd Bergmann Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Acked-by: Michael Ellerman Signed-off-by: Jason A. Donenfeld Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/include/asm/timex.h | 1 + 1 file changed, 1 insertion(+) --- a/arch/powerpc/include/asm/timex.h +++ b/arch/powerpc/include/asm/timex.h @@ -22,6 +22,7 @@ static inline cycles_t get_cycles(void) return mftb(); } +#define get_cycles get_cycles #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_TIMEX_H */