diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-16 10:28:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-16 10:28:29 -0700 |
| commit | e623175f6418f5873b28ca91a88312843b2e0dab (patch) | |
| tree | fde5264186a22a6857330fa2acc64946c3ab2eb6 | |
| parent | 4a1c388ce0521163f1556f7edbacb50ec2df15cf (diff) | |
| parent | 775d3c514c5b2763a50ab7839026d7561795924d (diff) | |
| download | linux-e623175f6418f5873b28ca91a88312843b2e0dab.tar.gz | |
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
| -rw-r--r-- | arch/x86/kernel/x86_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c index ef80d361b4632e..10622cf2b30f43 100644 --- a/arch/x86/kernel/x86_init.c +++ b/arch/x86/kernel/x86_init.c @@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; } static void iommu_shutdown_noop(void) { } bool __init bool_x86_init_noop(void) { return false; } void x86_op_int_noop(int cpu) { } -static __init int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; } -static __init void get_rtc_noop(struct timespec64 *now) { } +static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; } +static void get_rtc_noop(struct timespec64 *now) { } static __initconst const struct of_device_id of_cmos_match[] = { { .compatible = "motorola,mc146818" }, |