Received: by 2002:a6b:fb09:0:0:0:0:0 with SMTP id h9csp6048319iog; Thu, 23 Jun 2022 10:14:17 -0700 (PDT) X-Google-Smtp-Source: AGRyM1ss5+l6X2+BkIxL6UzZSwQKatdt8tq7ZQbfZLBWMhDxIqu+ICy/Buto9imZnZ5wYX9Wf8cO X-Received: by 2002:a17:907:6e9f:b0:711:d2cb:63d8 with SMTP id sh31-20020a1709076e9f00b00711d2cb63d8mr9217926ejc.232.1656004456871; Thu, 23 Jun 2022 10:14:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656004456; cv=none; d=google.com; s=arc-20160816; b=laAVX6+D4AvcX4mEvvtN17cHaLDURfuqFgY+0jjOaOBbNT8w5B0OGG3om4Sk2KDObt 2cOjzh4WcvKc6OFXX6W3tmqX94OU3MXwbgEQ6vVRodhQuHEUGDIOvVLijwTktzwu8FDF pYZZRCykAY4sCOMcYjidPGANfqaPDAaBtzGHX6GmNvgYySlcrNaq+ZhWUAoJhVNWsTLa 5TgkO0vJ+H9cHkbxRTkt90kyUQqCw+l+ZyWDYQk/zj0eVuEdBYaTU51StNFPAPjNjl0b 8XjnUjWvwqa9qAnaheH4ap8eaYeV0b8oIAKMXSSFDkvCy8e8UkZSrfsQbhF/gJ109BST +h/Q== 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=kJTJl99Szn6KiEcZpVTeojvFxl6IKUlmeHzkxnhGTII=; b=FwS0lMiPer/DBKZ8VzhWJR9IBMCpGKvpKqtxEFQ2CoFTEPNvQObuy89NHJPvf7GJ+q A2QMryv/l627038YK3r6VeHBJesHUTZba0aGGGhfOYPVH4qI4yB13ZsowaDldRsmHO+4 9PL276SV+9J8oehI92QBQ25R867oYScW/zO73rMjdnjy/x5fXFZYIiiWMefMtQdTtTTD vib0acrlzVf3KTmlfWL/+S06DTc+QaXOzgtj8Yf8/chkgw4jq5i6SDAJ/j4qgC6raG7n 2iznqlnDgHoYobX1UFqNoA1bo7pXpTohpXY14RkrzhYC408myUGjowNGmkhd6fTKoaO8 iC8g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="Acrzk/x/"; 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 l1-20020a50d6c1000000b0042df786609asi129564edj.262.2022.06.23.10.13.51; Thu, 23 Jun 2022 10:14:16 -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="Acrzk/x/"; 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 S231142AbiFWRD5 (ORCPT + 99 others); Thu, 23 Jun 2022 13:03:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230127AbiFWRBR (ORCPT ); Thu, 23 Jun 2022 13:01:17 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5406C4FC59; Thu, 23 Jun 2022 09:54:17 -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 A816DB82492; Thu, 23 Jun 2022 16:54:12 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E7CB2C341C4; Thu, 23 Jun 2022 16:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1656003251; bh=NU7LfoX5t0VpnGzmPaJ813yUdd6Ggjzgn/jJrjffIxY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Acrzk/x/q5aLmJgr42uCyQCdEPm81Kk/VNdXQl2h/i9AxO/MV0Rn8xDTvGizKqKSm 09pYvycM8io1d37th/b0WRxJMyDL6dy5d0PfwPSwrr9em9ldRnLjZMISfoLyuFIyKy nhxHHH047H6PzMw5dVvHVr8czFzYYU2roCF07KvE= 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.9 179/264] s390: define get_cycles macro for arch-override Date: Thu, 23 Jun 2022 18:42:52 +0200 Message-Id: <20220623164349.131344826@linuxfoundation.org> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220623164344.053938039@linuxfoundation.org> References: <20220623164344.053938039@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 @@ -168,6 +168,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 long *clock); void init_cpu_timer(void);