Commit e623175f authored by Linus Torvalds's avatar Linus Torvalds

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
parents 4a1c388c 775d3c51
...@@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; } ...@@ -33,8 +33,8 @@ static int __init iommu_init_noop(void) { return 0; }
static void iommu_shutdown_noop(void) { } static void iommu_shutdown_noop(void) { }
bool __init bool_x86_init_noop(void) { return false; } bool __init bool_x86_init_noop(void) { return false; }
void x86_op_int_noop(int cpu) { } void x86_op_int_noop(int cpu) { }
static __init int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; } static int set_rtc_noop(const struct timespec64 *now) { return -EINVAL; }
static __init void get_rtc_noop(struct timespec64 *now) { } static void get_rtc_noop(struct timespec64 *now) { }
static __initconst const struct of_device_id of_cmos_match[] = { static __initconst const struct of_device_id of_cmos_match[] = {
{ .compatible = "motorola,mc146818" }, { .compatible = "motorola,mc146818" },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment