arm64: avoid prototype warnings for syscalls

[linux.git] / drivers / clocksource / hyperv_timer.c

diff --git a/drivers/clocksource/hyperv_timer.c b/drivers/clocksource/hyperv_timer.c
index c0cef92b12b82fdef9e178a7ecb6a79f44f3ab42..bcd9042a0c9f460a4eeece614d0b032176ccc620 100644 (file)
--- a/drivers/clocksource/hyperv_timer.c
+++ b/drivers/clocksource/hyperv_timer.c
@@ -49,7 +49,7 @@ static bool direct_mode_enabled;
 
 static int stimer0_irq = -1;
 static int stimer0_message_sint;
 
 static int stimer0_irq = -1;
 static int stimer0_message_sint;

-static DEFINE_PER_CPU(long, stimer0_evt);
+static __maybe_unused DEFINE_PER_CPU(long, stimer0_evt);

 
 /*
  * Common code for stimer0 interrupts coming via Direct Mode or
 
 /*
  * Common code for stimer0 interrupts coming via Direct Mode or


@@ -68,7 +68,7 @@ EXPORT_SYMBOL_GPL(hv_stimer0_isr);
  * stimer0 interrupt handler for architectures that support
  * per-cpu interrupts, which also implies Direct Mode.
  */
  * stimer0 interrupt handler for architectures that support
  * per-cpu interrupts, which also implies Direct Mode.
  */

-static irqreturn_t hv_stimer0_percpu_isr(int irq, void *dev_id)
+static irqreturn_t __maybe_unused hv_stimer0_percpu_isr(int irq, void *dev_id)

 {
        hv_stimer0_isr();
        return IRQ_HANDLED;
 {
        hv_stimer0_isr();
        return IRQ_HANDLED;


@@ -196,6 +196,7 @@ void __weak hv_remove_stimer0_handler(void)
 {
 };
 
 {
 };
 

+#ifdef CONFIG_ACPI

 /* Called only on architectures with per-cpu IRQs (i.e., not x86/x64) */
 static int hv_setup_stimer0_irq(void)
 {
 /* Called only on architectures with per-cpu IRQs (i.e., not x86/x64) */
 static int hv_setup_stimer0_irq(void)
 {


@@ -230,6 +231,16 @@ static void hv_remove_stimer0_irq(void)
                stimer0_irq = -1;
        }
 }
                stimer0_irq = -1;
        }
 }

+#else
+static int hv_setup_stimer0_irq(void)
+{
+       return 0;
+}
+
+static void hv_remove_stimer0_irq(void)
+{
+}
+#endif

 
 /* hv_stimer_alloc - Global initialization of the clockevent and stimer0 */
 int hv_stimer_alloc(bool have_percpu_irqs)
 
 /* hv_stimer_alloc - Global initialization of the clockevent and stimer0 */
 int hv_stimer_alloc(bool have_percpu_irqs)


@@ -506,9 +517,6 @@ static bool __init hv_init_tsc_clocksource(void)
 {
        union hv_reference_tsc_msr tsc_msr;
 
 {
        union hv_reference_tsc_msr tsc_msr;
 

-       if (!(ms_hyperv.features & HV_MSR_REFERENCE_TSC_AVAILABLE))
-               return false;
-

        /*
         * If Hyper-V offers TSC_INVARIANT, then the virtualized TSC correctly
         * handles frequency and offset changes due to live migration,
        /*
         * If Hyper-V offers TSC_INVARIANT, then the virtualized TSC correctly
         * handles frequency and offset changes due to live migration,


@@ -525,6 +533,9 @@ static bool __init hv_init_tsc_clocksource(void)
                hyperv_cs_msr.rating = 250;
        }
 
                hyperv_cs_msr.rating = 250;
        }
 

+       if (!(ms_hyperv.features & HV_MSR_REFERENCE_TSC_AVAILABLE))
+               return false;
+

        hv_read_reference_counter = read_hv_clock_tsc;
 
        /*
        hv_read_reference_counter = read_hv_clock_tsc;
 
        /*