Skip to content

Commit 772d0e9

Browse files
committed
Merge tag 'timers-urgent-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer doc fixes from Ingo Molnar: - Fix various DocBook formatting errors in kernel/time/ that generated (justified) warnings during a kernel-doc build. * tag 'timers-urgent-2023-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: time: Fix various kernel-doc problems
2 parents a7b19c6 + f3cb808 commit 772d0e9

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

kernel/time/tick-oneshot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#include "tick-internal.h"
1919

2020
/**
21-
* tick_program_event
21+
* tick_program_event - program the CPU local timer device for the next event
2222
*/
2323
int tick_program_event(ktime_t expires, int force)
2424
{
@@ -99,7 +99,7 @@ int tick_switch_to_oneshot(void (*handler)(struct clock_event_device *))
9999
}
100100

101101
/**
102-
* tick_check_oneshot_mode - check whether the system is in oneshot mode
102+
* tick_oneshot_mode_active - check whether the system is in oneshot mode
103103
*
104104
* returns 1 when either nohz or highres are enabled. otherwise 0.
105105
*/

kernel/time/time.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ struct __kernel_old_timeval ns_to_kernel_old_timeval(s64 nsec)
462462
EXPORT_SYMBOL(ns_to_kernel_old_timeval);
463463

464464
/**
465-
* set_normalized_timespec - set timespec sec and nsec parts and normalize
465+
* set_normalized_timespec64 - set timespec sec and nsec parts and normalize
466466
*
467467
* @ts: pointer to timespec variable to be set
468468
* @sec: seconds to set
@@ -526,7 +526,7 @@ struct timespec64 ns_to_timespec64(s64 nsec)
526526
EXPORT_SYMBOL(ns_to_timespec64);
527527

528528
/**
529-
* msecs_to_jiffies: - convert milliseconds to jiffies
529+
* __msecs_to_jiffies: - convert milliseconds to jiffies
530530
* @m: time in milliseconds
531531
*
532532
* conversion is done as follows:
@@ -541,12 +541,12 @@ EXPORT_SYMBOL(ns_to_timespec64);
541541
* handling any 32-bit overflows.
542542
* for the details see __msecs_to_jiffies()
543543
*
544-
* msecs_to_jiffies() checks for the passed in value being a constant
544+
* __msecs_to_jiffies() checks for the passed in value being a constant
545545
* via __builtin_constant_p() allowing gcc to eliminate most of the
546546
* code, __msecs_to_jiffies() is called if the value passed does not
547547
* allow constant folding and the actual conversion must be done at
548548
* runtime.
549-
* the _msecs_to_jiffies helpers are the HZ dependent conversion
549+
* The _msecs_to_jiffies helpers are the HZ dependent conversion
550550
* routines found in include/linux/jiffies.h
551551
*/
552552
unsigned long __msecs_to_jiffies(const unsigned int m)

kernel/time/timekeeping.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,10 +1590,10 @@ void __weak read_persistent_clock64(struct timespec64 *ts)
15901590
/**
15911591
* read_persistent_wall_and_boot_offset - Read persistent clock, and also offset
15921592
* from the boot.
1593+
* @wall_time: current time as returned by persistent clock
1594+
* @boot_offset: offset that is defined as wall_time - boot_time
15931595
*
15941596
* Weak dummy function for arches that do not yet support it.
1595-
* @wall_time: - current time as returned by persistent clock
1596-
* @boot_offset: - offset that is defined as wall_time - boot_time
15971597
*
15981598
* The default function calculates offset based on the current value of
15991599
* local_clock(). This way architectures that support sched_clock() but don't
@@ -1701,7 +1701,7 @@ static void __timekeeping_inject_sleeptime(struct timekeeper *tk,
17011701
}
17021702

17031703
#if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE)
1704-
/**
1704+
/*
17051705
* We have three kinds of time sources to use for sleep time
17061706
* injection, the preference order is:
17071707
* 1) non-stop clocksource
@@ -1722,7 +1722,7 @@ bool timekeeping_rtc_skipresume(void)
17221722
return !suspend_timing_needed;
17231723
}
17241724

1725-
/**
1725+
/*
17261726
* 1) can be determined whether to use or not only when doing
17271727
* timekeeping_resume() which is invoked after rtc_suspend(),
17281728
* so we can't skip rtc_suspend() surely if system has 1).

0 commit comments

Comments
 (0)