Message ID | 167516098801.4906.2814079392382418239.tip-bot2@tip-bot2 |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2675544wrn; Tue, 31 Jan 2023 02:38:53 -0800 (PST) X-Google-Smtp-Source: AK7set+oAa9KdP8eAtTEneTWl4T0rOb845jM/mWKGjVnvPhjFdJFZIl3e8hJbxxKecRFG7VER3Wp X-Received: by 2002:a17:906:378e:b0:88c:617f:bcf8 with SMTP id n14-20020a170906378e00b0088c617fbcf8mr1369740ejc.61.1675161533461; Tue, 31 Jan 2023 02:38:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675161533; cv=none; d=google.com; s=arc-20160816; b=Ja2JfiO1lChh8MEM0CvWO4ELzHd/v5o5LYcU+bAfvoQ5z8aB8GHlIHt8wekkwDN27D O6DlT5gRDFIG9ZL597LXLZ9M8o4QrGponkn85m7GJQp0jURBzAwQ02IgUwcefuDhkaor rmLRdNljzNIfZeXh/zDgBFxZfvyWqBa21iF5i81X4aj3De53wWtc427EbfPRiN8fp+r3 2oDpExTzZLlYujmSmtJEq0XarcEhhngoUW+JfxJlWn0+hpUSKVDdLaDaP3k+yZ/gVhz6 G4I8nLWyz5j67OZfpljKa/+T60kUJp9SZhjyEzGJhU5FhL67ITm1SCfWdDiKF11+FI2t qe/A== 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=ZSFLu5PcmayMzopI1PFzP7fFHTORSpbtQIe8QyeRbQ0=; b=IVDV0a2PuOnrfAZZI/ANWxmOgElc36Zi+4LsW8CRLBlCFZJVK2FSbGQ+BFZpEaXms9 Z3htpMjnubnE/kH6Wfs2qkP7QKz7oJZAIeMwVyhoMO+/XWjqJyGS/rwXW4SW+6HsNfI+ i3cWcRoUWIsCRD8s7c9dn/jG1YDcH/WoW/K6qkO1WoybXScifbfpjp3a5ZfmPUZWCOLS kwXzuRTqnCirSxStngebryg0GVHrljUYAW2DZtE/rFqdT/1QOQk9bO9CBFBCets4DFtr JRlYUkN54k+KIMWAwN7bV+wxbLCluExDSWOP+V8KfGKqEYJHoO4a55lM6r9tFqX5WKxw 5rtQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=sDPU5+8r; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=M+loRO7B; 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 ft38-20020a170907802600b008893db9590fsi5455151ejc.856.2023.01.31.02.38.29; Tue, 31 Jan 2023 02:38:53 -0800 (PST) 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=sDPU5+8r; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=M+loRO7B; 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 S230443AbjAaK34 (ORCPT <rfc822;maxin.john@gmail.com> + 99 others); Tue, 31 Jan 2023 05:29:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54896 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231357AbjAaK3u (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 31 Jan 2023 05:29:50 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8FD52E809; Tue, 31 Jan 2023 02:29:49 -0800 (PST) Date: Tue, 31 Jan 2023 10:29:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675160988; 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=ZSFLu5PcmayMzopI1PFzP7fFHTORSpbtQIe8QyeRbQ0=; b=sDPU5+8rbUNbk1oIr7DZHYma+m1uQXzpqODf1mYB/NmffCakDpx2zyAQDctV2tGD8CF5dC X2JF7wSyf7gcqfZu0tbMfmM3PNHwEDrcW5ePZNtLXVJt0zjy8V6kLW++/b6XBvdMGOZQHh arBXTmCk0tIpqLIkyCTxt77HfFegSYUsTBLTviQzH/y6EeqjIrxB+VIuEC1r8vzooiDr8Z NlfXmcPCwrYobcQgdoKnR05wXCQmAdCIYSNt4uUmaVV1fX/4SHDRieykI2RT/FSTeGtP4x E0H1wMVau6WGPLrubnBnVN4klvyHtbHRUQl3/kpqG4inFny6ti7BVlLbaF2xhA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675160988; 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=ZSFLu5PcmayMzopI1PFzP7fFHTORSpbtQIe8QyeRbQ0=; b=M+loRO7BRXvfuBV79is4+0PvsASBl6EhoHgZ7L+ivCo4vCvS3Q+XV+XgdEm1DoI8Qkjgru cITXtM7wk3soi/CA== From: "tip-bot2 for Davidlohr Bueso" <tip-bot2@linutronix.de> Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] hrtimer: Rely on rt_task() for DL tasks too Cc: Davidlohr Bueso <dave@stgolabs.net>, Thomas Gleixner <tglx@linutronix.de>, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230123173206.6764-2-dave@stgolabs.net> References: <20230123173206.6764-2-dave@stgolabs.net> MIME-Version: 1.0 Message-ID: <167516098801.4906.2814079392382418239.tip-bot2@tip-bot2> Robot-ID: <tip-bot2@linutronix.de> Robot-Unsubscribe: Contact <mailto:tglx@linutronix.de> to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit 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 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756534180435911367?= X-GMAIL-MSGID: =?utf-8?q?1756534180435911367?= |
Series |
[tip:,timers/core] hrtimer: Rely on rt_task() for DL tasks too
|
|
Commit Message
tip-bot2 for Thomas Gleixner
Jan. 31, 2023, 10:29 a.m. UTC
The following commit has been merged into the timers/core branch of tip: Commit-ID: c14fd3dcacaa480394d3ac0b4a91a7d17a4b5516 Gitweb: https://git.kernel.org/tip/c14fd3dcacaa480394d3ac0b4a91a7d17a4b5516 Author: Davidlohr Bueso <dave@stgolabs.net> AuthorDate: Mon, 23 Jan 2023 09:32:05 -08:00 Committer: Thomas Gleixner <tglx@linutronix.de> CommitterDate: Tue, 31 Jan 2023 11:23:07 +01:00 hrtimer: Rely on rt_task() for DL tasks too Checking dl_task() is redundant as rt_task() returns true for deadline tasks too. Signed-off-by: Davidlohr Bueso <dave@stgolabs.net> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Link: https://lore.kernel.org/r/20230123173206.6764-2-dave@stgolabs.net --- kernel/time/hrtimer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index e4f0e3b..667b713 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c @@ -2089,7 +2089,7 @@ long hrtimer_nanosleep(ktime_t rqtp, const enum hrtimer_mode mode, u64 slack; slack = current->timer_slack_ns; - if (dl_task(current) || rt_task(current)) + if (rt_task(current)) slack = 0; hrtimer_init_sleeper_on_stack(&t, clockid, mode);