From patchwork Sun Jun 18 20:49:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 109677 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2637561vqr; Sun, 18 Jun 2023 14:01:26 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4uV8JJmc8BGhgeRUYfo6QtDgKwA8ZT3bU+Rf7dwAKhIgx2u9xKOeRqO/Ch2vySHtyO20do X-Received: by 2002:a05:6870:3a1c:b0:1a9:b063:67a4 with SMTP id du28-20020a0568703a1c00b001a9b06367a4mr3060798oab.38.1687122085981; Sun, 18 Jun 2023 14:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687122085; cv=none; d=google.com; s=arc-20160816; b=G/ZnD5fb+GteFQUoIiLQ0PjRAs2OQeHZRQhGWV/czQBEqsyOuMaxyjqcBngBOf3qki XDGgMbiztzbcQHAExoDA7j113BiT2rr6nLVLqnFTaCsuap8KZUJ+hs+zkamf1FcoXr5N mgqzPAiTicynWHcmKpEHCOxIDhcvrW0WlyrardOIA2xSRWZft83BOU8CzKR/hXdBbYFJ UlV6jYeIYeKg0HZfj57NJ/c/PuQcbQtvJLrYpZLKu7vh5rxcZEZBR0NMGAI6q09H+ybA DqSe8mcrQvUbjzlH9CrI4R1JgDrzoMW0jWj1rL0k6VLAS1c1qXy3UXcJeDrtM+48CPTW a7Xw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=9NKlCjYYtsYEMjkky+I/67VkCfEEfQE7QK6wpqKMOlA=; b=rHZNHGXHpk8q27mq977+RrxBWyIpWIGWBmGUK1L6SXzRm8rBzRI1aIZyholp5YCGL4 HJqfUgPLmI1fhOY4LZSuXXmuipjZxTqbhZ0YTPussHHakgk0tK8BPR3tAbLzudBA8r5l qwQnYvhy47u9ed1K1sv680vHDIRxGYZYMPpIGgknn2d4PBD4CtkwFzzye2w1Tw9aJDAA /VbQAVNWXkkmCXo1tIjNsKQT4YYG12WhNWPGd4l4jQ5WpfSNzjze1+LhZ9kgMAMqknOg uQsFyvrKQcPma9q+nrL4rSDMJyEBgw3QlT5Y9I7aCmCDYzqwC0sNQ5OrSnE7z8eU+c6o QqTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=rYwDR51K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="X8/BUldo"; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs64-20020a632843000000b0054f81c81d98si13956857pgb.194.2023.06.18.14.01.13; Sun, 18 Jun 2023 14:01:25 -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=@linutronix.de header.s=2020 header.b=rYwDR51K; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="X8/BUldo"; 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=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229671AbjFRUuN (ORCPT + 99 others); Sun, 18 Jun 2023 16:50:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229574AbjFRUt6 (ORCPT ); Sun, 18 Jun 2023 16:49:58 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9061B123; Sun, 18 Jun 2023 13:49:57 -0700 (PDT) Date: Sun, 18 Jun 2023 20:49:55 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1687121395; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9NKlCjYYtsYEMjkky+I/67VkCfEEfQE7QK6wpqKMOlA=; b=rYwDR51KUwq9OCjUYHjQbLwtq1B2O2E/NLeo15lXHhEVnqP1AEp6feZABsf2SVGJ5h8WRe 55iyO9Yodb2rTAfTpMSRwkQ7pEUPXTf9XdaDx4HEEmdeXphodBrY4MDt0CgQJH+ih71xbg j8SogqgQ7OuPGejvpNd6j1uLw1u+BQ4UvLnLP820FQKEf5yTI/iIKNV9MyDNquAophBGEV +vJC7C5BQ8a25iXfDSikGg4oJL1KmIPTDTWRUfc+/CsJaF7BNsOuG5ZOHK6VIsPTCgSZGg RBGucH4Z+Bg+YNq2FFUz7Y3BIvATk0fQ4VWEGVs2apuhWTeE2qXp8qE6kQzAgg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1687121395; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9NKlCjYYtsYEMjkky+I/67VkCfEEfQE7QK6wpqKMOlA=; b=X8/BUldorilHZ6M9r/BYdJLrvKK6ENfiZqhvIqCEBN7oAVpZAaRfDP4EmHSTbhnsTOhBPD h3CDG7gIfCbI8CAA== From: "tip-bot2 for Lukas Bulwahn" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS Cc: Lukas Bulwahn , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230609094643.26253-1-lukas.bulwahn@gmail.com> References: <20230609094643.26253-1-lukas.bulwahn@gmail.com> MIME-Version: 1.0 Message-ID: <168712139525.404.13303439009029401314.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1768317897786611552?= X-GMAIL-MSGID: =?utf-8?q?1769075728506588886?= The following commit has been merged into the timers/core branch of tip: Commit-ID: b9a40f24d8ea86f89f1299a3f2dccd601febe3e5 Gitweb: https://git.kernel.org/tip/b9a40f24d8ea86f89f1299a3f2dccd601febe3e5 Author: Lukas Bulwahn AuthorDate: Fri, 09 Jun 2023 11:46:43 +02:00 Committer: Thomas Gleixner CommitterDate: Sun, 18 Jun 2023 22:41:53 +02:00 posix-timers: Refer properly to CONFIG_HIGH_RES_TIMERS Commit c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments") turns an ifdef CONFIG_HIGH_RES_TIMERS into an conditional on "IS_ENABLED(CONFIG_HIGHRES_TIMERS)"; note that the new conditional refers to "HIGHRES_TIMERS" not "HIGH_RES_TIMERS" as before. Fix this typo introduced in that refactoring. Fixes: c78f261e5dcb ("posix-timers: Clarify posix_timer_fn() comments") Signed-off-by: Lukas Bulwahn Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230609094643.26253-1-lukas.bulwahn@gmail.com --- kernel/time/posix-timers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index e3cddd5..b924f0f 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c @@ -356,7 +356,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer) * enabled as the periodic tick based timers are * automatically aligned to the next tick. */ - if (IS_ENABLED(CONFIG_HIGHRES_TIMERS)) { + if (IS_ENABLED(CONFIG_HIGH_RES_TIMERS)) { ktime_t kj = TICK_NSEC; if (timr->it_interval < kj)