Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp6137924iog; Thu, 23 Jun 2022 12:08:14 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vAzNDZdBt4z1+pOH+z/ZKj/Ewwcpdo7ndZhvkBwPdymdtYFztTumb7elN8G4mbbG59Q3ya X-Received: by 2002:a05:6402:2790:b0:431:4bb6:a6dc with SMTP id b16-20020a056402279000b004314bb6a6dcmr12636464ede.48.1656011294250; Thu, 23 Jun 2022 12:08:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656011294; cv=none; d=google.com; s=arc-20160816; b=T7/iG7pJHd8Blj6mh4llRt1282EfAILAkQAf+ph75nxPgj8fgF1e3fblwOuDbf2D3u FCGdZ0eWc9A9uAizN+lTt5UKYostBWPPqK3zg76mel6MnYkLLUzDeDgyzc+5PWmA/N1O T729l+l5mMi21eSG+6kMntTSS2bmdsMe2VZM3pkOAymiU7KeyedKOl9f96psJDQsRoVd /OQCdulv6vUiP2ADbdR/OoqFCeReqo+32RJZao29UGxJJo5meseluSl2A4xkxZ613VPG jn7yUzopZQwL8cIkIt3vuKcgzZixjRITSKY0/22Br9XZc0P3NiH75fm++xQfS6znKsUJ GXHA== 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=qEn7aw4hTCPKg/MfxhkmBZTcE2dQTEoVJZkYjz4qBw8=; b=XH6Twku2L4C5HdIwoFLdFk4njQTtAfxOO+wgPkGe69fqgQS4H/yjVTpj9/wkSiL5m4 giq5BLsGFC3HDh9le3ClcjseWRv2HqwNu05wcXv+mBRDqwDBXbHP9vpAnlUQvOoP6Mot V5LLELP6PSnXQRaPj3GUdB5JkO0+lE5PVCt9IkYhKx63RfN122TNJy9KWw1M5mDVb5JK Wzdwc9XKdC8kiBHV5UwUdNYcEYsUhUPNmKyVDZRPcneP1IdiiowS9rKCEeDHi5295CyG 8hwz+1Qm+LYDYhFjwXM1Q0rpfR/a7MWHYSD50g3C3+6t9MZw01C/uF8FH8XOvPRS4OUO izEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Cv8ySDuu; 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 du6-20020a17090772c600b0071d3b6e50fbsi7872412ejc.402.2022.06.23.12.07.47; Thu, 23 Jun 2022 12:08:14 -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=Cv8ySDuu; 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 S236074AbiFWSJF (ORCPT + 99 others); Thu, 23 Jun 2022 14:09:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236069AbiFWSGo (ORCPT ); Thu, 23 Jun 2022 14:06:44 -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 B6CC989D33; Thu, 23 Jun 2022 10:19:04 -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 18212B824C2; Thu, 23 Jun 2022 17:19:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68583C385A2; Thu, 23 Jun 2022 17:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656004741; bh=NEJRdzIBCon7lIGhM4SzG1yXI0kNFTJSk5arjusZ2Bc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cv8ySDuuZpRyTUgalgeg0SB+qKeR0HzK756WN3wP5086Lgxqk99e/KV+RSshOwAw+ ZwOJ1HhrRIhLJ5ED4Jai7snrpPy2Nzeq80OOQtWpVBmDeAR4C6TpWzTLblZf+IR5lj bXdkzFC6WdG2C4HK3z3rD+d70udM077JXjeE0h7s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Thomas Gleixner , Arnd Bergmann , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , Heiko Carstens , "Jason A. Donenfeld" Subject: [PATCH 4.19 136/234] s390: define get_cycles macro for arch-override Date: Thu, 23 Jun 2022 18:43:23 +0200 Message-Id: <20220623164346.905616392@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623164343.042598055@linuxfoundation.org> References: <20220623164343.042598055@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 2e3df523256cb9836de8441e9c791a796759bb3c upstream. S390x 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: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Acked-by: Heiko Carstens Signed-off-by: Jason A. Donenfeld Signed-off-by: Greg Kroah-Hartman --- arch/s390/include/asm/timex.h | 1 + 1 file changed, 1 insertion(+) --- a/arch/s390/include/asm/timex.h +++ b/arch/s390/include/asm/timex.h @@ -177,6 +177,7 @@ static inline cycles_t get_cycles(void) { return (cycles_t) get_tod_clock() >> 2; } +#define get_cycles get_cycles int get_phys_clock(unsigned long *clock); void init_cpu_timer(void);