Skip to contentSkip to conversation

x86/mrst: match clocksource prototype change

PATCH New Jacob Pan 1 participant 1 message Mar 3, 2010 x86

lore
Share & tools
lore

Jacob Pan

author
#0 lore raw

PATCH 1/1 x86/mrst: match clocksource prototype change

Function prototype in clocksource.resume has been changed by commit 17622339. This patch makes the APB timer resume function match with the new prototype, otherwise GCC would complain incompatible pointer assignment.

---
 arch/x86/kernel/apb_timer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/x86/kernel/apb_timer.c +2 -2
index 83a345b..1232fe7 100644
@@ -69,7 +69,7 @@ static void apbt_set_mode(enum clock_event_mode mode,
 static int apbt_next_event(unsigned long delta,
                           struct clock_event_device *evt);
 static cycle_t apbt_read_clocksource(struct clocksource *cs);
-static void apbt_restart_clocksource(void);
+static void apbt_restart_clocksource(struct clocksource *cs);
 
 struct apbt_dev {
        struct clock_event_device       evt;
@@ -248,7 +248,7 @@ static irqreturn_t apbt_interrupt_handler(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static void apbt_restart_clocksource(void)
+static void apbt_restart_clocksource(struct clocksource *cs)
 {
        apbt_start_counter(phy_cs_timer_id);
 }
Signature · 1 line
1.5.6.5