]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
rtc: cmos: Remove the `use_acpi_alarm' module parameter for !ACPI
authorMaciej W. Rozycki <macro@linux-mips.org>
Tue, 2 Oct 2018 01:09:05 +0000 (02:09 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 13 Nov 2018 19:12:48 +0000 (11:12 -0800)
commit8631b7bd98b94efba28e918eac0311a6db03c3f4
tree6d472a94ab83f2ed5c80848f64e326ff7a30ab79
parent5b6bdf14357c1c535f6f534889c377c501f110fc
rtc: cmos: Remove the `use_acpi_alarm' module parameter for !ACPI

commit bc51098cdd9573bfdecfd02fc8ed474419d73ea0 upstream.

Fix a problem with commit 311ee9c151ad ("rtc: cmos: allow using ACPI for
RTC alarm instead of HPET") defining `use_acpi_alarm' module parameter
even for non-ACPI platforms, which ignore it.  Wrap the definition into
#ifdef CONFIG_ACPI and use a static inline wrapper function, hardcoded
to return 0 and consequently optimized away for !ACPI, following the
existing pattern with HPET handling functions.

Signed-off-by: Maciej W. Rozycki <macro@linux-mips.org>
Fixes: 311ee9c151ad ("rtc: cmos: allow using ACPI for RTC alarm instead of HPET")
Cc: stable@vger.kernel.org # 4.18+
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/rtc/rtc-cmos.c