diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-03 04:24:55 -0400 |
| commit | 66fdc951720406deb3b0f17094cb16ec623f525d (patch) | |
| tree | 24f0ea4cc5d563e4e11cb3bdeb0ca86dd28e8cb6 /kernel/time/clocksource.c | |
| parent | f425752fc66acf1d4e47970ea704ed7d31c14173 (diff) | |
| parent | 7d27558c4138ac6b3684dea35c2f4379b940a7dd (diff) | |
Merge branch 'timers/clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip
Diffstat (limited to 'kernel/time/clocksource.c')
| -rw-r--r-- | kernel/time/clocksource.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/kernel/time/clocksource.c b/kernel/time/clocksource.c index ecfd7b5187e0..80189f6f1c5a 100644 --- a/kernel/time/clocksource.c +++ b/kernel/time/clocksource.c | |||
| @@ -402,9 +402,6 @@ int clocksource_register(struct clocksource *c) | |||
| 402 | unsigned long flags; | 402 | unsigned long flags; |
| 403 | int ret; | 403 | int ret; |
| 404 | 404 | ||
| 405 | /* save mult_orig on registration */ | ||
| 406 | c->mult_orig = c->mult; | ||
| 407 | |||
| 408 | spin_lock_irqsave(&clocksource_lock, flags); | 405 | spin_lock_irqsave(&clocksource_lock, flags); |
| 409 | ret = clocksource_enqueue(c); | 406 | ret = clocksource_enqueue(c); |
| 410 | if (!ret) | 407 | if (!ret) |