From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0941B25776 for ; Mon, 15 Jun 2026 17:48:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781545714; cv=none; b=JN1FMtO++V1pGW5zYzS1Z+Fw2O5VmBALqzS+FYdXX72dyGVRS4sYD/fYbPOdWcEoJAY6/oOXoHb4kaIH1XWG3P2KiZCWIbQzo6L6wjjVSOV8A6kGTWFNiWlq3muU5BujULkJH9Zi4eZO1FSVKS8+G1HgzQXro+p5VtHlBbJUD8A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781545714; c=relaxed/simple; bh=n73P5IVuga5AOkvkYV5Vgzhl0vcsil4q6iqPpRP+l1E=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=hsJ/tQyBy1MnzreFm6sP0Gis9L9g1wfwOYdrMuXM25Uw7dHghtdKlg7admIvrO/yY+ZGjGDMPW8MkSdykrkSnIZB2Fx8jL4Edj43tjDEuHP2tISZxG/yOFWEUAo+QriRaMbAA8zvbVumLGBpXoip6SISN/kVFCTjtQ7wfSqFl5k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=niYetTJ+; arc=none smtp.client-ip=209.85.210.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="niYetTJ+" Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-84230ab8857so1701232b3a.1 for ; Mon, 15 Jun 2026 10:48:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1781545712; x=1782150512; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=t6cLlO62NhBNG+tKfY6H+RyutuPpXbvQu42ijvX7iYI=; b=niYetTJ+YACAE5aTJwHakEkwenlYOGLDaqlKVruFtZkWOW1yEkK/Ua3sXB0lKB9yx/ WGzuivJxyfzvYyW4wPPk2OGHI0YHrfvGPVI+ga/SAPIqPtF10dAGqqOXbFu9byX90gxl R4E0h601MVTCQEDUuYLsh1NXgfn91x6LguaZmF50YksF0/bt1wiLp0o9Wt+w+MbEVAU4 HS3oUffWR4ZaKoSMTOA4mfM/Ix0QQDLmA+iZW0Lsmww5EiUvfSuaMOwUbAAP5XsuqbLL IivrfSUH8dXyQo0t2ai0ocG/lUny+EL9clMQkC+V/JA92Zx1oklU8z53M6AzWVcAe14Q /WEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781545712; x=1782150512; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=t6cLlO62NhBNG+tKfY6H+RyutuPpXbvQu42ijvX7iYI=; b=YWjxl/6+hQ5MoSo22J6VQuGGjDMH9yDYbAFlJp6ObjMsHQxAEWWZKvKVpRGrCgdgn1 7PlNwnj5Wve1HTCS+T1zZVvSibdXxOeSaSIBaNKGOTj+kjeh43NKBdobmRAkRsTIwk+p FH/NgtcQmD3xMAEcke5Fvi3MWzapWwh8deg79vxj6394DCvsI9fWd2E215wKht0ax/vr afmVggsZ9HNlyR/RTm8KbEwkkazgVCVc/paKsji+6UoNbm/PzpMR3K05sTVEsxZJ5DKt JK5eGNA+znzFnIauw1MS/wdqiWrnzGj47NgpLPowdw+agzwlmtbnfuAZXVeKpygVATka SVBg== X-Gm-Message-State: AOJu0YyNsRUcjI10eZlHBVExMn41jA4u9xoCfEvqGb+CHraaAcNPh3TQ ZTXLvds6IxZ5VYMgyP2mW+NDj4yvCI5WLEAyuKTyJ/enc4SXgaBzcMW2aVTbq5QG X-Gm-Gg: Acq92OEysyat1O4p3HpzddHeChjsHscxkmyaCVsO6bDZYxIsEQ5ujiomwGxVBVHavz/ IFjyJ2GhrMs95wQP+snFYMcnAAmRb9kfEkwAwoeUWRfUHiC9dt7CtqgecvgyCCLG+Pd1W/it018 l+JstnLvR2cQ0Goagvb7uz1Jrt6XqRVy/mz6cWJF2+BMTV3Gr9cJdwfz2VcerZfCv3+LRSWATtK UiEIJMFC0HR9DJjO0GzE9bud4oDTDY+FSlP1N4mprT5yJwDTY1W/DUy//JiHXg0MLpr8/PweLmj 5HEyYvqetNTXfVFO4T2Y4c9/MyRqtHHnzVENMTQ/uVPCC9CXzQOW2HOpVo/ct86VP4bFamS295y bdiGzegUbBY2pJ12DNfr49ADNDhO8MY8tpvjMyt1tPAMTZ5fjN5FCtcYnievDusQSw4TnYvaDM5 xyNjeUsxlhtt/7Hz83k0vwyM+29oZLtPVsN5bhGfFoowigXmccBvBUAy1mz5hVL1oG2Ck1WUBOL A== X-Received: by 2002:a05:6a00:4fcf:b0:842:5711:9a2f with SMTP id d2e1a72fcca58-8434cf4f362mr16935126b3a.36.1781545712284; Mon, 15 Jun 2026 10:48:32 -0700 (PDT) Received: from Debian.tail27fc13.ts.net (125-229-204-75.hinet-ip.hinet.net. [125.229.204.75]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-8434ac9df57sm10969215b3a.7.2026.06.15.10.48.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2026 10:48:31 -0700 (PDT) From: Matthew Chen To: Petr Mladek , Douglas Anderson , Andrew Morton Cc: linux-kernel@vger.kernel.org, Matthew Chen Subject: [PATCH] watchdog/softlockup: Fix softlockup typos Date: Tue, 16 Jun 2026 01:45:57 +0800 Message-ID: <20260615174557.1836562-1-edcr1790@gmail.com> X-Mailer: git-send-email 2.47.3 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Fix misspellings of "softlockup" in the watchdog enabled bit definitions and related comments. Also fix a nearby "successful" typo. No functional change. Signed-off-by: Matthew Chen --- include/linux/nmi.h | 4 ++-- kernel/watchdog.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/linux/nmi.h b/include/linux/nmi.h index bc1162895f35..89c5465e2524 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h @@ -77,9 +77,9 @@ static inline void reset_hung_task_detector(void) { } * detectors are 'suspended' while 'watchdog_thresh' is equal zero. */ #define WATCHDOG_HARDLOCKUP_ENABLED_BIT 0 -#define WATCHDOG_SOFTOCKUP_ENABLED_BIT 1 +#define WATCHDOG_SOFTLOCKUP_ENABLED_BIT 1 #define WATCHDOG_HARDLOCKUP_ENABLED (1 << WATCHDOG_HARDLOCKUP_ENABLED_BIT) -#define WATCHDOG_SOFTOCKUP_ENABLED (1 << WATCHDOG_SOFTOCKUP_ENABLED_BIT) +#define WATCHDOG_SOFTLOCKUP_ENABLED (1 << WATCHDOG_SOFTLOCKUP_ENABLED_BIT) #if defined(CONFIG_HARDLOCKUP_DETECTOR) extern void hardlockup_detector_disable(void); diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 87dd5e0f6968..e5134ad7b663 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c @@ -359,14 +359,14 @@ static void lockup_detector_update_enable(void) if (watchdog_hardlockup_available && watchdog_hardlockup_user_enabled) watchdog_enabled |= WATCHDOG_HARDLOCKUP_ENABLED; if (watchdog_softlockup_user_enabled) - watchdog_enabled |= WATCHDOG_SOFTOCKUP_ENABLED; + watchdog_enabled |= WATCHDOG_SOFTLOCKUP_ENABLED; } #ifdef CONFIG_SOFTLOCKUP_DETECTOR /* - * Delay the soflockup report when running a known slow code. - * It does _not_ affect the timestamp of the last successdul reschedule. + * Delay the softlockup report when running a known slow code. + * It does _not_ affect the timestamp of the last successful reschedule. */ #define SOFTLOCKUP_DELAY_REPORT ULONG_MAX @@ -742,7 +742,7 @@ static int is_softlockup(unsigned long touch_ts, unsigned long period_ts, unsigned long now) { - if ((watchdog_enabled & WATCHDOG_SOFTOCKUP_ENABLED) && watchdog_thresh) { + if ((watchdog_enabled & WATCHDOG_SOFTLOCKUP_ENABLED) && watchdog_thresh) { /* * If period_ts has not been updated during a sample_period, then * in the subsequent few sample_periods, period_ts might also not @@ -1098,11 +1098,11 @@ static void proc_watchdog_update(bool thresh_changed) * caller | table->data points to | 'which' * -------------------|----------------------------------|------------------------------- * proc_watchdog | watchdog_user_enabled | WATCHDOG_HARDLOCKUP_ENABLED | - * | | WATCHDOG_SOFTOCKUP_ENABLED + * | | WATCHDOG_SOFTLOCKUP_ENABLED * -------------------|----------------------------------|------------------------------- * proc_nmi_watchdog | watchdog_hardlockup_user_enabled | WATCHDOG_HARDLOCKUP_ENABLED * -------------------|----------------------------------|------------------------------- - * proc_soft_watchdog | watchdog_softlockup_user_enabled | WATCHDOG_SOFTOCKUP_ENABLED + * proc_soft_watchdog | watchdog_softlockup_user_enabled | WATCHDOG_SOFTLOCKUP_ENABLED */ static int proc_watchdog_common(int which, const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) @@ -1136,7 +1136,7 @@ static int proc_watchdog(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { return proc_watchdog_common(WATCHDOG_HARDLOCKUP_ENABLED | - WATCHDOG_SOFTOCKUP_ENABLED, + WATCHDOG_SOFTLOCKUP_ENABLED, table, write, buffer, lenp, ppos); } @@ -1159,7 +1159,7 @@ static int proc_nmi_watchdog(const struct ctl_table *table, int write, static int proc_soft_watchdog(const struct ctl_table *table, int write, void *buffer, size_t *lenp, loff_t *ppos) { - return proc_watchdog_common(WATCHDOG_SOFTOCKUP_ENABLED, + return proc_watchdog_common(WATCHDOG_SOFTLOCKUP_ENABLED, table, write, buffer, lenp, ppos); } #endif -- 2.47.3