Skip to content

Commit e623175

Browse files
committed
Merge tag 'x86_urgent_for_v6.3_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Borislav Petkov: - Drop __init annotation from two rtc functions which get called after boot is done, in order to prevent a crash * tag 'x86_urgent_for_v6.3_rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86/rtc: Remove __init for runtime functions
2 parents 4a1c388 + 775d3c5 commit e623175

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/x86/kernel/x86_init.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; }
3333
static void iommu_shutdown_noop(void) { }
3434
bool __init bool_x86_init_noop(void) { return false; }
3535
void x86_op_int_noop(int cpu) { }
36-
static __init int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
37-
static __init void get_rtc_noop(struct timespec64 *now) { }
36+
static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
37+
static void get_rtc_noop(struct timespec64 *now) { }
3838

3939
static __initconst const struct of_device_id of_cmos_match[] = {
4040
{ .compatible = "motorola,mc146818" },

0 commit comments

Comments
 (0)