watchdog/softlockup: Fix softlockup typos
PATCH 1/1 watchdog/softlockup: Fix softlockup typos
Fix misspellings of "softlockup" in the watchdog enabled bit definitions and related comments. Also fix a nearby "successful" typo.
No functional change.
--- include/linux/nmi.h | 4 ++-- kernel/watchdog.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
include/linux/nmi.h +2 -2
@@ -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 );
kernel/watchdog.c +8 -8
@@ -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
Signature · 1 line
2.47.3
Hi,
Quoted 11 lines · Matthew Chen
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 <[email protected]>--- include/linux/nmi.h | 4 ++-- kernel/watchdog.c | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-)
Somewhat of an embarrassing typo, especially since it's so obvious when right next to "HARDLOCKUP". Oh well. Fix looks good, even if not terribly urgent.
Quoted 6 lines · Matthew Chen
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 <[email protected]>
I guess that I have some level of dyslexia ;-)
Anyway, great catch!
I assume that Andrew would take it via -mm tree.
Best Regards,
Petr