The patch titled
clockevents: let SMP kernels on UP systems use the PIT
has been added to the -mm tree. Its filename is
clockevents-smp-on-up-features.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: clockevents: let SMP kernels on UP systems use the PIT
Allow a SMP kernel to use the PIT for highres/dyntick on an UP machine.
Signed-of-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/kernel/i8253.c | 5 +----
kernel/time/clockevents.c | 6 +++---
2 files changed, 4 insertions(+), 7 deletions(-)
diff -puN arch/i386/kernel/i8253.c~clockevents-smp-on-up-features arch/i386/kernel/i8253.c
--- a/arch/i386/kernel/i8253.c~clockevents-smp-on-up-features
+++ a/arch/i386/kernel/i8253.c
@@ -85,10 +85,7 @@ static void pit_next_event(unsigned long
struct clock_event_device pit_clockevent = {
.name = "pit",
.capabilities = CLOCK_CAP_TICK | CLOCK_CAP_PROFILE | CLOCK_CAP_UPDATE
-#ifndef CONFIG_SMP
- | CLOCK_CAP_NEXTEVT
-#endif
- ,
+ | CLOCK_CAP_NEXTEVT,
.set_mode = init_pit_timer,
.set_next_event = pit_next_event,
.shift = 32,
diff -puN kernel/time/clockevents.c~clockevents-smp-on-up-features kernel/time/clockevents.c
--- a/kernel/time/clockevents.c~clockevents-smp-on-up-features
+++ a/kernel/time/clockevents.c
@@ -254,14 +254,14 @@ int __init register_global_clockevent(st
return -EINVAL;
}
-#ifdef CONFIG_SMP
/*
* On UP systems the global clock event device can be used as the next
* event device. On SMP this is disabled because the next event device
* must be per CPU.
*/
- evt->capabilities &= ~CLOCK_CAP_NEXTEVT;
-#endif
+ if (num_possible_cpus() > 1)
+ evt->capabilities &= ~CLOCK_CAP_NEXTEVT;
+
/* Mask out high resolution capabilities for now */
global_eventdevice.event = evt;
_
Patches currently in -mm which might be from tglx@xxxxxxxxxxxxx are
printk-timed-ratelimit.patch
schedule-removal-of-futex_fd.patch
setup_irq-better-mismatch-debugging.patch
gtod-exponential-update_wall_time.patch
gtod-persistent-clock-support-core.patch
gtod-persistent-clock-support-i386.patch
time-uninline-jiffiesh.patch
time-uninline-jiffiesh-fix.patch
time-fix-msecs_to_jiffies-bug.patch
time-fix-timeout-overflow.patch
cleanup-uninline-irq_enter-and-move-it-into-a-function.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie.patch
dynticks-extend-next_timer_interrupt-to-use-a-reference-jiffie-remove-incorrect-warning-in-kernel-timerc.patch
hrtimers-namespace-and-enum-cleanup.patch
hrtimers-clean-up-locking.patch
hrtimers-state-tracking.patch
hrtimers-clean-up-callback-tracking.patch
hrtimers-move-and-add-documentation.patch
clockevents-core.patch
clockevents-drivers-for-i386.patch
high-res-timers-core.patch
gtod-mark-tsc-unusable-for-highres-timers.patch
dynticks-core.patch
dynticks-add-nohz-stats-to-proc-stat.patch
dynticks-i386-arch-code.patch
high-res-timers-dynticks-enable-i386-support.patch
debugging-feature-timer-stats.patch
highres-timer-core-fix-status-check.patch
highres-timer-core-fix-commandline-setup.patch
clockevents-smp-on-up-features.patch
highres-depend-on-clockevents.patch
i386-apic-cleanup.patch
pm-timer-allow-early-access.patch
i386-lapic-timer-calibration.patch
clockevents-add-broadcast-support.patch
acpi-include-apic-h.patch
acpi-keep-track-of-timer-broadcast.patch
i386-apic-timer-use-clockevents-broadcast.patch
acpi-verify-lapic-timer.patch
round_jiffies-infrastructure.patch
round_jiffies-infrastructure-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
