public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH] x86/mrst: match clocksource prototype change
@ 2010-03-03  4:58 Jacob Pan
  0 siblings, 0 replies; only message in thread
From: Jacob Pan @ 2010-03-03  4:58 UTC (permalink / raw)
  To: Jacob Pan, LKML, H. Peter Anvin, Ingo Molnar, Thomas Gleixner; +Cc: Jacob Pan

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.

Signed-off-by: Jacob Pan <jacob.jun.pan@linux.intel.com>
---
 arch/x86/kernel/apb_timer.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index 83a345b..1232fe7 100644
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -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);
 }
-- 
1.5.6.5


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2010-03-03 11:05 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-03  4:58 [PATCH] x86/mrst: match clocksource prototype change Jacob Pan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox