git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Consolidate default sched_clock()
[safe/jmp/linux-2.6]
/
arch
/
alpha
/
kernel
/
time.c
diff --git
a/arch/alpha/kernel/time.c
b/arch/alpha/kernel/time.c
index
581ddcc
..
4748e14
100644
(file)
--- a/
arch/alpha/kernel/time.c
+++ b/
arch/alpha/kernel/time.c
@@
-57,6
+57,7
@@
static int set_rtc_mmss(unsigned long);
DEFINE_SPINLOCK(rtc_lock);
static int set_rtc_mmss(unsigned long);
DEFINE_SPINLOCK(rtc_lock);
+EXPORT_SYMBOL(rtc_lock);
#define TICK_SIZE (tick_nsec / 1000)
#define TICK_SIZE (tick_nsec / 1000)
@@
-90,21
+91,10
@@
static inline __u32 rpcc(void)
}
/*
}
/*
- * Scheduler clock - returns current time in nanosec units.
- *
- * Copied from ARM code for expediency... ;-}
- */
-unsigned long long sched_clock(void)
-{
- return (unsigned long long)jiffies * (1000000000 / HZ);
-}
-
-
-/*
* 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
, struct pt_regs * regs
)
+irqreturn_t timer_interrupt(int irq, void *dev)
{
unsigned long delta;
__u32 now;
{
unsigned long delta;
__u32 now;
@@
-112,7
+102,7
@@
irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs)
#ifndef CONFIG_SMP
/* Not SMP, do kernel PC profiling here. */
#ifndef CONFIG_SMP
/* Not SMP, do kernel PC profiling here. */
- profile_tick(CPU_PROFILING
, regs
);
+ profile_tick(CPU_PROFILING);
#endif
write_seqlock(&xtime_lock);
#endif
write_seqlock(&xtime_lock);
@@
-132,7
+122,7
@@
irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs)
while (nticks > 0) {
do_timer(1);
#ifndef CONFIG_SMP
while (nticks > 0) {
do_timer(1);
#ifndef CONFIG_SMP
- update_process_times(user_mode(
regs
));
+ update_process_times(user_mode(
get_irq_regs()
));
#endif
nticks--;
}
#endif
nticks--;
}