diff options
| author | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-17 20:48:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@home.transmeta.com> | 2002-06-17 20:48:29 -0700 |
| commit | 1f60ade2a44d22a67c75a165b70d66f9d4e0b76e (patch) | |
| tree | 7a8bda4c45fb3e5d255a023b030137e3b6be87ee /kernel/timer.c | |
| parent | 8509486ae776be099cbedb6c37c37741ddc20ad8 (diff) | |
| parent | 3986594c6167a269053d3d88f17e53e0ca4023f8 (diff) | |
Merge master.kernel.org:/home/mingo/bk-sched
into home.transmeta.com:/home/torvalds/v2.5/linux
Diffstat (limited to 'kernel/timer.c')
| -rw-r--r-- | kernel/timer.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 0b7efa84970b..858954c871e1 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -22,6 +22,7 @@ #include <linux/delay.h> #include <linux/smp_lock.h> #include <linux/interrupt.h> +#include <linux/tqueue.h> #include <linux/kernel_stat.h> #include <asm/uaccess.h> @@ -69,11 +70,11 @@ unsigned long event; extern int do_setitimer(int, struct itimerval *, struct itimerval *); /* - * The 64-bit value is not volatile - you MUST NOT read it + * The 64-bit jiffies value is not atomic - you MUST NOT read it * without holding read_lock_irq(&xtime_lock). * jiffies is defined in the linker script... */ -u64 jiffies_64; + unsigned int * prof_buffer; unsigned long prof_len; @@ -231,11 +232,6 @@ int del_timer(struct timer_list * timer) } #ifdef CONFIG_SMP -void sync_timers(void) -{ - spin_unlock_wait(&global_bh_lock); -} - /* * SMP specific function to delete periodic timer. * Caller must disable by some means restarting the timer |