diff options
Diffstat (limited to 'arch/sh64/kernel/time.c')
-rw-r--r-- | arch/sh64/kernel/time.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c index 870fe5327e09..1195af37ee5a 100644 --- a/arch/sh64/kernel/time.c +++ b/arch/sh64/kernel/time.c | |||
@@ -417,7 +417,7 @@ static __init unsigned int get_cpu_hz(void) | |||
417 | /* | 417 | /* |
418 | ** Regardless the toolchain, force the compiler to use the | 418 | ** Regardless the toolchain, force the compiler to use the |
419 | ** arbitrary register r3 as a clock tick counter. | 419 | ** arbitrary register r3 as a clock tick counter. |
420 | ** NOTE: r3 must be in accordance with rtc_interrupt() | 420 | ** NOTE: r3 must be in accordance with sh64_rtc_interrupt() |
421 | */ | 421 | */ |
422 | register unsigned long long __rtc_irq_flag __asm__ ("r3"); | 422 | register unsigned long long __rtc_irq_flag __asm__ ("r3"); |
423 | 423 | ||
@@ -482,7 +482,8 @@ static __init unsigned int get_cpu_hz(void) | |||
482 | #endif | 482 | #endif |
483 | } | 483 | } |
484 | 484 | ||
485 | static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 485 | static irqreturn_t sh64_rtc_interrupt(int irq, void *dev_id, |
486 | struct pt_regs *regs) | ||
486 | { | 487 | { |
487 | ctrl_outb(0, RCR1); /* Disable Carry Interrupts */ | 488 | ctrl_outb(0, RCR1); /* Disable Carry Interrupts */ |
488 | regs->regs[3] = 1; /* Using r3 */ | 489 | regs->regs[3] = 1; /* Using r3 */ |
@@ -491,7 +492,7 @@ static irqreturn_t rtc_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
491 | } | 492 | } |
492 | 493 | ||
493 | static struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL}; | 494 | static struct irqaction irq0 = { timer_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "timer", NULL, NULL}; |
494 | static struct irqaction irq1 = { rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL}; | 495 | static struct irqaction irq1 = { sh64_rtc_interrupt, SA_INTERRUPT, CPU_MASK_NONE, "rtc", NULL, NULL}; |
495 | 496 | ||
496 | void __init time_init(void) | 497 | void __init time_init(void) |
497 | { | 498 | { |