diff options
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 72a12d931cba..2830f656fe2f 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -77,7 +77,6 @@ static void mips_timer_dispatch (struct pt_regs *regs) | |||
77 | 77 | ||
78 | irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 78 | irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) |
79 | { | 79 | { |
80 | #ifdef CONFIG_SMP | ||
81 | int cpu = smp_processor_id(); | 80 | int cpu = smp_processor_id(); |
82 | 81 | ||
83 | if (cpu == 0) { | 82 | if (cpu == 0) { |
@@ -85,10 +84,9 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
85 | * CPU 0 handles the global timer interrupt job and process accounting | 84 | * CPU 0 handles the global timer interrupt job and process accounting |
86 | * resets count/compare registers to trigger next timer int. | 85 | * resets count/compare registers to trigger next timer int. |
87 | */ | 86 | */ |
88 | (void) timer_interrupt(irq, dev_id, regs); | 87 | timer_interrupt(irq, dev_id, regs); |
89 | scroll_display_message(); | 88 | scroll_display_message(); |
90 | } | 89 | } else { |
91 | else { | ||
92 | /* Everyone else needs to reset the timer int here as | 90 | /* Everyone else needs to reset the timer int here as |
93 | ll_local_timer_interrupt doesn't */ | 91 | ll_local_timer_interrupt doesn't */ |
94 | /* | 92 | /* |
@@ -104,15 +102,6 @@ irqreturn_t mips_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs) | |||
104 | } | 102 | } |
105 | 103 | ||
106 | return IRQ_HANDLED; | 104 | return IRQ_HANDLED; |
107 | #else | ||
108 | irqreturn_t r; | ||
109 | |||
110 | r = timer_interrupt(irq, dev_id, regs); | ||
111 | |||
112 | scroll_display_message(); | ||
113 | |||
114 | return r; | ||
115 | #endif | ||
116 | } | 105 | } |
117 | 106 | ||
118 | /* | 107 | /* |