Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

+10 -10
+2 -2
kernel/time/tick-oneshot.c
··· 18 18 #include "tick-internal.h" 19 19 20 20 /** 21 - * tick_program_event 21 + * tick_program_event - program the CPU local timer device for the next event 22 22 */ 23 23 int tick_program_event(ktime_t expires, int force) 24 24 { ··· 99 99 } 100 100 101 101 /** 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 103 103 * 104 104 * returns 1 when either nohz or highres are enabled. otherwise 0. 105 105 */
+4 -4
kernel/time/time.c
··· 462 462 EXPORT_SYMBOL(ns_to_kernel_old_timeval); 463 463 464 464 /** 465 - * set_normalized_timespec - set timespec sec and nsec parts and normalize 465 + * set_normalized_timespec64 - set timespec sec and nsec parts and normalize 466 466 * 467 467 * @ts: pointer to timespec variable to be set 468 468 * @sec: seconds to set ··· 526 526 EXPORT_SYMBOL(ns_to_timespec64); 527 527 528 528 /** 529 - * msecs_to_jiffies: - convert milliseconds to jiffies 529 + * __msecs_to_jiffies: - convert milliseconds to jiffies 530 530 * @m: time in milliseconds 531 531 * 532 532 * conversion is done as follows: ··· 541 541 * handling any 32-bit overflows. 542 542 * for the details see __msecs_to_jiffies() 543 543 * 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 545 545 * via __builtin_constant_p() allowing gcc to eliminate most of the 546 546 * code, __msecs_to_jiffies() is called if the value passed does not 547 547 * allow constant folding and the actual conversion must be done at 548 548 * runtime. 549 - * the _msecs_to_jiffies helpers are the HZ dependent conversion 549 + * The _msecs_to_jiffies helpers are the HZ dependent conversion 550 550 * routines found in include/linux/jiffies.h 551 551 */ 552 552 unsigned long __msecs_to_jiffies(const unsigned int m)
+4 -4
kernel/time/timekeeping.c
··· 1590 1590 /** 1591 1591 * read_persistent_wall_and_boot_offset - Read persistent clock, and also offset 1592 1592 * 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 1593 1595 * 1594 1596 * 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 1597 1597 * 1598 1598 * The default function calculates offset based on the current value of 1599 1599 * local_clock(). This way architectures that support sched_clock() but don't ··· 1701 1701 } 1702 1702 1703 1703 #if defined(CONFIG_PM_SLEEP) && defined(CONFIG_RTC_HCTOSYS_DEVICE) 1704 - /** 1704 + /* 1705 1705 * We have three kinds of time sources to use for sleep time 1706 1706 * injection, the preference order is: 1707 1707 * 1) non-stop clocksource ··· 1722 1722 return !suspend_timing_needed; 1723 1723 } 1724 1724 1725 - /** 1725 + /* 1726 1726 * 1) can be determined whether to use or not only when doing 1727 1727 * timekeeping_resume() which is invoked after rtc_suspend(), 1728 1728 * so we can't skip rtc_suspend() surely if system has 1).