Skip to content

Commit 9e643ab

Browse files
rddunlapIngo Molnar
authored andcommitted
timers: Fix text inconsistencies and spelling
Fix some text for consistency: s/lvl/level/ in a comment and use correct/full function names in comments. Correct spelling errors as reported by codespell. Signed-off-by: Randy Dunlap <[email protected]> Signed-off-by: Ingo Molnar <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ba6ad57 commit 9e643ab

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

kernel/time/timer.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -64,15 +64,15 @@ EXPORT_SYMBOL(jiffies_64);
6464

6565
/*
6666
* The timer wheel has LVL_DEPTH array levels. Each level provides an array of
67-
* LVL_SIZE buckets. Each level is driven by its own clock and therefor each
67+
* LVL_SIZE buckets. Each level is driven by its own clock and therefore each
6868
* level has a different granularity.
6969
*
70-
* The level granularity is: LVL_CLK_DIV ^ lvl
70+
* The level granularity is: LVL_CLK_DIV ^ level
7171
* The level clock frequency is: HZ / (LVL_CLK_DIV ^ level)
7272
*
7373
* The array level of a newly armed timer depends on the relative expiry
7474
* time. The farther the expiry time is away the higher the array level and
75-
* therefor the granularity becomes.
75+
* therefore the granularity becomes.
7676
*
7777
* Contrary to the original timer wheel implementation, which aims for 'exact'
7878
* expiry of the timers, this implementation removes the need for recascading
@@ -207,7 +207,7 @@ EXPORT_SYMBOL(jiffies_64);
207207
* struct timer_base - Per CPU timer base (number of base depends on config)
208208
* @lock: Lock protecting the timer_base
209209
* @running_timer: When expiring timers, the lock is dropped. To make
210-
* sure not to race agains deleting/modifying a
210+
* sure not to race against deleting/modifying a
211211
* currently running timer, the pointer is set to the
212212
* timer, which expires at the moment. If no timer is
213213
* running, the pointer is NULL.
@@ -737,7 +737,7 @@ static bool timer_is_static_object(void *addr)
737737
}
738738

739739
/*
740-
* fixup_init is called when:
740+
* timer_fixup_init is called when:
741741
* - an active object is initialized
742742
*/
743743
static bool timer_fixup_init(void *addr, enum debug_obj_state state)
@@ -761,7 +761,7 @@ static void stub_timer(struct timer_list *unused)
761761
}
762762

763763
/*
764-
* fixup_activate is called when:
764+
* timer_fixup_activate is called when:
765765
* - an active object is activated
766766
* - an unknown non-static object is activated
767767
*/
@@ -783,7 +783,7 @@ static bool timer_fixup_activate(void *addr, enum debug_obj_state state)
783783
}
784784

785785
/*
786-
* fixup_free is called when:
786+
* timer_fixup_free is called when:
787787
* - an active object is freed
788788
*/
789789
static bool timer_fixup_free(void *addr, enum debug_obj_state state)
@@ -801,7 +801,7 @@ static bool timer_fixup_free(void *addr, enum debug_obj_state state)
801801
}
802802

803803
/*
804-
* fixup_assert_init is called when:
804+
* timer_fixup_assert_init is called when:
805805
* - an untracked/uninit-ed object is found
806806
*/
807807
static bool timer_fixup_assert_init(void *addr, enum debug_obj_state state)
@@ -914,7 +914,7 @@ static void do_init_timer(struct timer_list *timer,
914914
* @key: lockdep class key of the fake lock used for tracking timer
915915
* sync lock dependencies
916916
*
917-
* init_timer_key() must be done to a timer prior calling *any* of the
917+
* init_timer_key() must be done to a timer prior to calling *any* of the
918918
* other timer functions.
919919
*/
920920
void init_timer_key(struct timer_list *timer,
@@ -1417,7 +1417,7 @@ static int __timer_delete(struct timer_list *timer, bool shutdown)
14171417
* If @shutdown is set then the lock has to be taken whether the
14181418
* timer is pending or not to protect against a concurrent rearm
14191419
* which might hit between the lockless pending check and the lock
1420-
* aquisition. By taking the lock it is ensured that such a newly
1420+
* acquisition. By taking the lock it is ensured that such a newly
14211421
* enqueued timer is dequeued and cannot end up with
14221422
* timer->function == NULL in the expiry code.
14231423
*
@@ -2306,7 +2306,7 @@ static inline u64 __get_next_timer_interrupt(unsigned long basej, u64 basem,
23062306

23072307
/*
23082308
* When timer base is not set idle, undo the effect of
2309-
* tmigr_cpu_deactivate() to prevent inconsitent states - active
2309+
* tmigr_cpu_deactivate() to prevent inconsistent states - active
23102310
* timer base but inactive timer migration hierarchy.
23112311
*
23122312
* When timer base was already marked idle, nothing will be

0 commit comments

Comments
 (0)