diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-07-09 17:27:23 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-07-13 16:26:18 -0400 |
commit | ece2246ebda3d86cedb9414e7771862a6c9a054c (patch) | |
tree | c29ea5f47279ca694c1385f24213ea3650728592 /arch/mips | |
parent | 54d0a216f40e060ba4265bb851cc36b3ca55d1a8 (diff) |
[MIPS] Atlas, Malta, SEAD: Don't disable interrupts in mips_time_init().
By the time it's called from time_init interrupts are still disabled.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/mips-boards/generic/time.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/mips/mips-boards/generic/time.c b/arch/mips/mips-boards/generic/time.c index 8e846d175ee1..557bf961f36a 100644 --- a/arch/mips/mips-boards/generic/time.c +++ b/arch/mips/mips-boards/generic/time.c | |||
@@ -228,9 +228,7 @@ unsigned long __init mips_rtc_get_time(void) | |||
228 | 228 | ||
229 | void __init mips_time_init(void) | 229 | void __init mips_time_init(void) |
230 | { | 230 | { |
231 | unsigned int est_freq, flags; | 231 | unsigned int est_freq; |
232 | |||
233 | local_irq_save(flags); | ||
234 | 232 | ||
235 | /* Set Data mode - binary. */ | 233 | /* Set Data mode - binary. */ |
236 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); | 234 | CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL); |
@@ -241,8 +239,6 @@ void __init mips_time_init(void) | |||
241 | (est_freq%1000000)*100/1000000); | 239 | (est_freq%1000000)*100/1000000); |
242 | 240 | ||
243 | cpu_khz = est_freq / 1000; | 241 | cpu_khz = est_freq / 1000; |
244 | |||
245 | local_irq_restore(flags); | ||
246 | } | 242 | } |
247 | 243 | ||
248 | void __init plat_timer_setup(struct irqaction *irq) | 244 | void __init plat_timer_setup(struct irqaction *irq) |