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
7a89689
..
6ea0177
100644
(file)
--- a/
arch/m32r/kernel/time.c
+++ b/
arch/m32r/kernel/time.c
@@
-34,11
+34,9
@@
#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(struct pt_regs *);
+extern void smp_local_timer_interrupt(void);
#endif
#endif
-extern unsigned long wall_jiffies;
#define TICK_SIZE (tick_nsec / 1000)
/*
#define TICK_SIZE (tick_nsec / 1000)
/*
@@
-108,24
+106,17
@@
void do_gettimeofday(struct timeval *tv)
unsigned long max_ntp_tick = tick_usec - tickadj;
do {
unsigned long max_ntp_tick = tick_usec - tickadj;
do {
- unsigned long lost;
-
seq = read_seqbegin(&xtime_lock);
usec = do_gettimeoffset();
seq = read_seqbegin(&xtime_lock);
usec = do_gettimeoffset();
- lost = jiffies - wall_jiffies;
/*
* If time_adjust is negative then NTP is slowing the clock
* so make sure not to go into next possible interval.
* Better to lose some accuracy than have time go backwards..
*/
/*
* If time_adjust is negative then NTP is slowing the clock
* so make sure not to go into next possible interval.
* Better to lose some accuracy than have time go backwards..
*/
- if (unlikely(time_adjust < 0))
{
+ if (unlikely(time_adjust < 0))
usec = min(usec, max_ntp_tick);
usec = min(usec, max_ntp_tick);
- if (lost)
- usec += lost * max_ntp_tick;
- } else if (unlikely(lost))
- usec += lost * tick_usec;
sec = xtime.tv_sec;
usec += (xtime.tv_nsec / 1000);
sec = xtime.tv_sec;
usec += (xtime.tv_nsec / 1000);
@@
-158,7
+149,6
@@
int do_settimeofday(struct timespec *tv)
* made, and then undo it!
*/
nsec -= do_gettimeoffset() * NSEC_PER_USEC;
* made, and then undo it!
*/
nsec -= do_gettimeoffset() * NSEC_PER_USEC;
- nsec -= (jiffies - wall_jiffies) * TICK_NSEC;
wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
wtm_sec = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@
-197,15
+187,15
@@
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, struct pt_regs *regs
)
+
static irqreturn_t timer_interrupt(int irq, void *dev_id
)
{
#ifndef CONFIG_SMP
{
#ifndef CONFIG_SMP
- profile_tick(CPU_PROFILING
, regs
);
+ profile_tick(CPU_PROFILING);
#endif
do_timer(1);
#ifndef CONFIG_SMP
#endif
do_timer(1);
#ifndef CONFIG_SMP
- update_process_times(user_mode(
regs
));
+ update_process_times(user_mode(
get_irq_regs()
));
#endif
/*
* If we have an externally synchronized Linux clock, then update
#endif
/*
* If we have an externally synchronized Linux clock, then update
@@
-230,15
+220,19
@@
irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
a hack, so don't look closely for now.. */
#ifdef CONFIG_SMP
a hack, so don't look closely for now.. */
#ifdef CONFIG_SMP
- smp_local_timer_interrupt(
regs
);
+ smp_local_timer_interrupt();
smp_send_timer();
#endif
return IRQ_HANDLED;
}
smp_send_timer();
#endif
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)
{
@@
-295,11
+289,3
@@
void __init time_init(void)
#error no chip configuration
#endif
}
#error no chip configuration
#endif
}
-
-/*
- * Scheduler clock - returns current time in nanosec units.
- */
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}