git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge current mainline tree into linux-omap tree
[pandora-kernel.git]
/
arch
/
m32r
/
kernel
/
time.c
diff --git
a/arch/m32r/kernel/time.c
b/arch/m32r/kernel/time.c
index
3858c9f
..
6ea0177
100644
(file)
--- a/
arch/m32r/kernel/time.c
+++ b/
arch/m32r/kernel/time.c
@@
-34,7
+34,6
@@
#include <asm/hw_irq.h>
#ifdef CONFIG_SMP
#include <asm/hw_irq.h>
#ifdef CONFIG_SMP
-extern void send_IPI_allbutself(int, int);
extern void smp_local_timer_interrupt(void);
#endif
extern void smp_local_timer_interrupt(void);
#endif
@@
-188,7
+187,7
@@
static long last_rtc_update = 0;
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
*/
* timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick
*/
-irqreturn_t timer_interrupt(int irq, void *dev_id)
+
static
irqreturn_t timer_interrupt(int irq, void *dev_id)
{
#ifndef CONFIG_SMP
profile_tick(CPU_PROFILING);
{
#ifndef CONFIG_SMP
profile_tick(CPU_PROFILING);
@@
-228,8
+227,12
@@
irqreturn_t timer_interrupt(int irq, void *dev_id)
return IRQ_HANDLED;
}
return IRQ_HANDLED;
}
-struct irqaction irq0 = { timer_interrupt, IRQF_DISABLED, CPU_MASK_NONE,
- "MFT2", NULL, NULL };
+static struct irqaction irq0 = {
+ .handler = timer_interrupt,
+ .flags = IRQF_DISABLED,
+ .mask = CPU_MASK_NONE,
+ .name = "MFT2",
+};
void __init time_init(void)
{
void __init time_init(void)
{