diff options
| author | Linus Torvalds | 2022-10-04 09:13:21 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-10-04 09:13:21 -0700 |
| commit | f8475a6749ae9727878c189bbff073a257e43cba (patch) | |
| tree | 6735a68a7d3019fb6d2ec6f0b43fab64e4d7b544 /arch/x86/include | |
| parent | 3339914a5832cffdecd578931b3db20d3deba5f6 (diff) | |
| parent | e1a6bc7c6969527dbe0afa4801a0237e41e26b1b (diff) | |
Merge tag 'x86_timers_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RTC cleanups from Borislav Petkov:
- Cleanup x86/rtc.c and delete duplicated functionality in favor of
using the respective functionality from the RTC library
* tag 'x86_timers_for_v6.1_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/rtc: Rename mach_set_rtc_mmss() to mach_set_cmos_time()
x86/rtc: Rewrite & simplify mach_get_cmos_time() by deleting duplicated functionality
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mc146818rtc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h index 97198001e567..6115bb3d5795 100644 --- a/arch/x86/include/asm/mc146818rtc.h +++ b/arch/x86/include/asm/mc146818rtc.h @@ -95,7 +95,7 @@ static inline unsigned char current_lock_cmos_reg(void) unsigned char rtc_cmos_read(unsigned char addr); void rtc_cmos_write(unsigned char val, unsigned char addr); -extern int mach_set_rtc_mmss(const struct timespec64 *now); +extern int mach_set_cmos_time(const struct timespec64 *now); extern void mach_get_cmos_time(struct timespec64 *now); #define RTC_IRQ 8 |