diff options
| author | Linus Torvalds | 2008-07-15 19:39:57 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2008-07-15 19:39:57 +0200 |
| commit | da6e88f4963385b1b649b043691d206fbb951913 (patch) | |
| tree | 779a1a6cf04dad09dee0828ad4ece0927de1b5f3 /kernel/hrtimer.c | |
| parent | Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/li... (diff) | |
| parent | Merge commit '900cfa46191a7d87cf1891924cb90499287fd235'; branches 'timers/noh... (diff) | |
| download | kernel-qcow2-linux-da6e88f4963385b1b649b043691d206fbb951913.tar.gz kernel-qcow2-linux-da6e88f4963385b1b649b043691d206fbb951913.tar.xz kernel-qcow2-linux-da6e88f4963385b1b649b043691d206fbb951913.zip | |
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add PCI ID for 6300ESB force hpet
x86: add another PCI ID for ICH6 force-hpet
kernel-paramaters: document pmtmr= command line option
acpi_pm clccksource: fix printk format warning
nohz: don't stop idle tick if softirqs are pending.
pmtmr: allow command line override of ioport
nohz: reduce jiffies polling overhead
hrtimer: Remove unused variables in ktime_divns()
hrtimer: remove warning in hres_timers_resume
posix-timers: print RT watchdog message
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index 27a83ee41443..2913a8bff612 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -300,11 +300,10 @@ EXPORT_SYMBOL_GPL(ktime_sub_ns); */ u64 ktime_divns(const ktime_t kt, s64 div) { - u64 dclc, inc, dns; + u64 dclc; int sft = 0; - dclc = dns = ktime_to_ns(kt); - inc = div; + dclc = ktime_to_ns(kt); /* Make sure the divisor is less than 2^32: */ while (div >> 32) { sft++; @@ -632,8 +631,6 @@ void clock_was_set(void) */ void hres_timers_resume(void) { - WARN_ON_ONCE(num_online_cpus() > 1); - /* Retrigger the CPU local events: */ retrigger_next_event(NULL); } |