From patchwork Wed Jul 19 07:47:37 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: 122442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp2276695vqt; Wed, 19 Jul 2023 01:07:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlGjrWJGHLvGNeXzQnNGNK6LIYids73B1goC1DUmL5pdQqojmgHLP1XCLaTehnYyrsgKPhAZ X-Received: by 2002:a17:907:6d0b:b0:989:3148:e9a with SMTP id sa11-20020a1709076d0b00b0098931480e9amr2250646ejc.41.1689754029469; Wed, 19 Jul 2023 01:07:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689754029; cv=none; d=google.com; s=arc-20160816; b=HG7f9IjjKocMZLL4YYoQLGe5fmK09njMDcuVRZN5Ss2kZc0zvBedca2dN7IvoHQgMi pgu4wtPNHCRqR0fja/jWanydCmraFWfYh93nUsyICPwp0Z0CEUv00O73fL/CveIrlmy7 lTj72NEWHjt6InZ6HCznZksHR6gwS8DMq3HdfpBVJpyK+qWqAIcSrMcDoPj0Y9gS8WED eAlWaVnFO48HEJrNyoxCwoXVPHyOpLLWD46samWL7GUFzUidoQbns6YsOSjZh8aAEnf6 zpsva1smSJWUFIC0pbltINwMoY91ZGI4DuJh3JJOcn0xadK3zBfEDsYOpHJ3UW0GDomu hgKw== 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=crG8yI+O19YDwNsTIzlOmC+Mf49wGu7sPAQKUPi6ugc=; fh=LruJFfQI2Q3cM0KwHFy58i470KpLME3gv1Sp2ksosoM=; b=UJc8QheR4z2s36O0xMpwPQKVVZXele4ypCCklbrW1vVVg5JI3RYkF2WUUc1Nv+khsx A9YJURoBUh7IPUVhwsw/iGCpmsLCSwKJrdcqor3xkn4uCKm75O2R50JdmP231vsA5G9q qJGFfqNlX0Dh5B5FgB2JPZ4jfLWqClbhJ+/KRoa0aS31YfP460rZMIBeLg1aEoUwvf3V Z0Q8uFgQbBxYP68VEO3ymUOB7nUjGFBExICTa7DrLRvQeNHITMIm2lUkeRVe0TDdCW7p B2IpNhpzBUVVg4Vv1zvNtE/6RDN1tYraU37Usys55e6pZKs6fDGEhjYCXhS/KlPaDsnK nl5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=XzD4TUZ5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XTaFpCDF; 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 n7-20020a170906b30700b009829cb69a02si2230404ejz.1034.2023.07.19.01.06.45; Wed, 19 Jul 2023 01:07:09 -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=XzD4TUZ5; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=XTaFpCDF; 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 S229807AbjGSHsI (ORCPT + 99 others); Wed, 19 Jul 2023 03:48:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230333AbjGSHrm (ORCPT ); Wed, 19 Jul 2023 03:47:42 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F008B1736; Wed, 19 Jul 2023 00:47:39 -0700 (PDT) Date: Wed, 19 Jul 2023 07:47:37 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1689752858; 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=crG8yI+O19YDwNsTIzlOmC+Mf49wGu7sPAQKUPi6ugc=; b=XzD4TUZ5x6YtlzybKbQliIBsCC7EYD8UmtqN41Ui5SX9D0HRiBxVbhneM8QnmL2wL1utB/ LhAESxtjqjEoNqHao38mqIzGtsSvCVS2xGI0SRj4XInckA5uUEHvTNPScdBOhtJKkfZIZb pdWoVGTmbeCKyv/DjFMFIDl5SgcX8/ydcDyb1PgXonHz6zNWkzCuamaMArtLR8vPfnuRq2 eELraspdNktnRv65o0oX73r+b+9fIrU/1y1JhcVSQfro44rYIXCIl6hXLTg02SEYowAdrd NdJyA6y5tCAH5Z01m7gGloHDAYgrxCghJOrdThRic6+bWKbzPcjvksGlQwyGuQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1689752858; 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=crG8yI+O19YDwNsTIzlOmC+Mf49wGu7sPAQKUPi6ugc=; b=XTaFpCDF/phJb3Faj0sH2FQ/LwGAIlMNVaFawpfdR1ciWGQv1hvECadDUPb7+yyLTxHOnZ 2AkmdBxMwLNl0YCg== From: "tip-bot2 for Chin Yik Ming" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: sched/core] sched/headers: Rename task_struct::state to task_struct::__state in the comments too Cc: Chin Yik Ming , Ingo Molnar , Daniel Bristot de Oliveira , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230717064952.2804-1-yikming2222@gmail.com> References: <20230717064952.2804-1-yikming2222@gmail.com> MIME-Version: 1.0 Message-ID: <168975285779.28540.5554306672674995336.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1771835521303994884 X-GMAIL-MSGID: 1771835521303994884 The following commit has been merged into the sched/core branch of tip: Commit-ID: 48b5583719cdfbdee238f9549a6a1a47af2b0469 Gitweb: https://git.kernel.org/tip/48b5583719cdfbdee238f9549a6a1a47af2b0469 Author: Chin Yik Ming AuthorDate: Mon, 17 Jul 2023 14:49:52 +08:00 Committer: Ingo Molnar CommitterDate: Wed, 19 Jul 2023 09:42:58 +02:00 sched/headers: Rename task_struct::state to task_struct::__state in the comments too The rename in 2f064a59a11f ("sched: Change task_struct::state") missed the comments. [ mingo: Improved the changelog. ] Signed-off-by: Chin Yik Ming Signed-off-by: Ingo Molnar Reviewed-by: Daniel Bristot de Oliveira Link: https://lore.kernel.org/r/20230717064952.2804-1-yikming2222@gmail.com --- include/linux/sched.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index efc9f4b..2aab7be 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -75,14 +75,14 @@ struct user_event_mm; * Task state bitmask. NOTE! These bits are also * encoded in fs/proc/array.c: get_task_state(). * - * We have two separate sets of flags: task->state + * We have two separate sets of flags: task->__state * is about runnability, while task->exit_state are * about the task exiting. Confusing, but this way * modifying one set can't modify the other one by * mistake. */ -/* Used in tsk->state: */ +/* Used in tsk->__state: */ #define TASK_RUNNING 0x00000000 #define TASK_INTERRUPTIBLE 0x00000001 #define TASK_UNINTERRUPTIBLE 0x00000002 @@ -92,7 +92,7 @@ struct user_event_mm; #define EXIT_DEAD 0x00000010 #define EXIT_ZOMBIE 0x00000020 #define EXIT_TRACE (EXIT_ZOMBIE | EXIT_DEAD) -/* Used in tsk->state again: */ +/* Used in tsk->__state again: */ #define TASK_PARKED 0x00000040 #define TASK_DEAD 0x00000080 #define TASK_WAKEKILL 0x00000100 @@ -173,7 +173,7 @@ struct user_event_mm; #endif /* - * set_current_state() includes a barrier so that the write of current->state + * set_current_state() includes a barrier so that the write of current->__state * is correctly serialised wrt the caller's subsequent test of whether to * actually sleep: * @@ -196,9 +196,9 @@ struct user_event_mm; * wake_up_state(p, TASK_UNINTERRUPTIBLE); * * where wake_up_state()/try_to_wake_up() executes a full memory barrier before - * accessing p->state. + * accessing p->__state. * - * Wakeup will do: if (@state & p->state) p->state = TASK_RUNNING, that is, + * Wakeup will do: if (@state & p->__state) p->__state = TASK_RUNNING, that is, * once it observes the TASK_UNINTERRUPTIBLE store the waking CPU can issue a * TASK_RUNNING store which can collide with __set_current_state(TASK_RUNNING). *