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
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
arm
/
kernel
/
time.c
diff --git
a/arch/arm/kernel/time.c
b/arch/arm/kernel/time.c
index
bfed0f4
..
efcb44a
100644
(file)
--- a/
arch/arm/kernel/time.c
+++ b/
arch/arm/kernel/time.c
@@
-27,12
+27,15
@@
#include <linux/errno.h>
#include <linux/profile.h>
#include <linux/sysdev.h>
#include <linux/errno.h>
#include <linux/profile.h>
#include <linux/sysdev.h>
+#include <linux/timer.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/leds.h>
#include <asm/hardware.h>
#include <asm/io.h>
#include <asm/irq.h>
#include <asm/leds.h>
+#include <asm/mach/time.h>
+
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
@@
-49,15
+52,11
@@
EXPORT_SYMBOL(rtc_lock);
/* change this if you have some constant time drift */
#define USECS_PER_JIFFY (1000000/HZ)
/* change this if you have some constant time drift */
#define USECS_PER_JIFFY (1000000/HZ)
-static int dummy_set_rtc(void)
-{
- return 0;
-}
/*
* hook for setting the RTC's idea of the current time.
*/
/*
* hook for setting the RTC's idea of the current time.
*/
-int (*set_rtc)(void)
= dummy_set_rtc
;
+int (*set_rtc)(void);
static unsigned long dummy_gettimeoffset(void)
{
static unsigned long dummy_gettimeoffset(void)
{
@@
-238,7
+237,7
@@
EXPORT_SYMBOL(leds_event);
#endif
#ifdef CONFIG_LEDS_TIMER
#endif
#ifdef CONFIG_LEDS_TIMER
-static void do_leds(void)
+static
inline
void do_leds(void)
{
static unsigned int count = 50;
{
static unsigned int count = 50;
@@
-248,7
+247,7
@@
static void do_leds(void)
}
}
#else
}
}
#else
-#define do_leds()
+#define
do_leds()
#endif
void do_gettimeofday(struct timeval *tv)
#endif
void do_gettimeofday(struct timeval *tv)
@@
-316,12
+315,18
@@
int do_settimeofday(struct timespec *tv)
EXPORT_SYMBOL(do_settimeofday);
EXPORT_SYMBOL(do_settimeofday);
-static struct irqaction timer_irq = {
- .name = "timer",
- .flags = SA_INTERRUPT,
-};
+void timer_tick(struct pt_regs *regs)
+{
+ do_profile(regs);
+ do_leds();
+ do_set_rtc();
+ do_timer(regs);
+}
+
+void (*init_arch_time)(void);
+
+void __init time_init(void)
+{
+ init_arch_time();
+}
-/*
- * Include architecture specific code
- */
-#include <asm/arch/time.h>