git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
mips
/
mips-boards
/
generic
/
time.c
diff --git
a/arch/mips/mips-boards/generic/time.c
b/arch/mips/mips-boards/generic/time.c
index
a9f6124
..
557bf96
100644
(file)
--- a/
arch/mips/mips-boards/generic/time.c
+++ b/
arch/mips/mips-boards/generic/time.c
@@
-19,7
+19,6
@@
*/
#include <linux/types.h>
*/
#include <linux/types.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
#include <linux/init.h>
#include <linux/kernel_stat.h>
#include <linux/sched.h>
@@
-229,9
+228,7
@@
unsigned long __init mips_rtc_get_time(void)
void __init mips_time_init(void)
{
void __init mips_time_init(void)
{
- unsigned int est_freq, flags;
-
- local_irq_save(flags);
+ unsigned int est_freq;
/* Set Data mode - binary. */
CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
/* Set Data mode - binary. */
CMOS_WRITE(CMOS_READ(RTC_CONTROL) | RTC_DM_BINARY, RTC_CONTROL);
@@
-242,11
+239,9
@@
void __init mips_time_init(void)
(est_freq%1000000)*100/1000000);
cpu_khz = est_freq / 1000;
(est_freq%1000000)*100/1000000);
cpu_khz = est_freq / 1000;
-
- local_irq_restore(flags);
}
}
-void __init
mips
_timer_setup(struct irqaction *irq)
+void __init
plat
_timer_setup(struct irqaction *irq)
{
if (cpu_has_veic) {
set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);
{
if (cpu_has_veic) {
set_vi_handler (MSC01E_INT_CPUCTR, mips_timer_dispatch);