The patch titled udpate x86_64-mm-unify-rewrite-smp-tsc-sync-code has been added to the -mm tree. Its filename is update-x86_64-mm-unify-rewrite-smp-tsc-sync-code.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: udpate x86_64-mm-unify-rewrite-smp-tsc-sync-code From: Ingo Molnar <mingo@xxxxxxx> updated patch below. (Mike Galbraith reported that suspend broke on -rt kernels, it was due to an __init/__cpuinit mismatch) Signed-off-by: Ingo Molnar <mingo@xxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/i386/kernel/tsc.c | 2 +- arch/x86_64/kernel/tsc_sync.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/tsc.c~update-x86_64-mm-unify-rewrite-smp-tsc-sync-code arch/i386/kernel/tsc.c --- a/arch/i386/kernel/tsc.c~update-x86_64-mm-unify-rewrite-smp-tsc-sync-code +++ a/arch/i386/kernel/tsc.c @@ -433,7 +433,7 @@ out: * Make an educated guess if the TSC is trustworthy and synchronized * over all CPUs. */ -__init int unsynchronized_tsc(void) +__cpuinit int unsynchronized_tsc(void) { if (!cpu_has_tsc || tsc_unstable) return 1; diff -puN arch/x86_64/kernel/tsc_sync.c~update-x86_64-mm-unify-rewrite-smp-tsc-sync-code arch/x86_64/kernel/tsc_sync.c --- a/arch/x86_64/kernel/tsc_sync.c~update-x86_64-mm-unify-rewrite-smp-tsc-sync-code +++ a/arch/x86_64/kernel/tsc_sync.c @@ -1,5 +1,5 @@ /* - * arch/i386/kernel/tsc_sync.c: check TSC synchronization. + * arch/x86_64/kernel/tsc_sync.c: check TSC synchronization. * * Copyright (C) 2006, Red Hat, Inc., Ingo Molnar * _ Patches currently in -mm which might be from mingo@xxxxxxx are origin.patch git-scsi-misc.patch update-x86_64-mm-unify-rewrite-smp-tsc-sync-code.patch genapic-optimize-fix-apic-mode-setup.patch cleanup-arch-i386-kernel-smpbootcsmp_tune_scheduling.patch convert-i386-pda-code-to-use-%fs.patch x86_64-check-vector-in-setup_ioapic_dest-to-verify-if-need-setup_io_apic_irq.patch convert-pm_sem-to-a-mutex.patch convert-pm_sem-to-a-mutex-fix.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch sysrq-x-show-blocked-tasks.patch lockdep-internal-locking-fixes.patch lockdep-misc-fixes-in-lockdepc.patch cpuset-remove-sched-domain-hooks-from-cpusets.patch binfmt_elf-randomize-pie-binaries.patch disable-clone_child_cleartid-for-abnormal-exit.patch lockdep-annotate-bcsp-driver.patch lockdep-print-current-locks-on-in_atomic-warnings.patch lockdep-name-some-old-style-locks.patch sleep-profiling.patch sleep-profiling-fixes.patch sleep-profiling-fix.patch debug-workqueue-locking-sanity.patch debug-workqueue-locking-sanity-fix.patch retries-in-ext3_prepare_write-violate-ordering-requirements.patch ktime-fix-signed--unsigned-mismatch-in-ktime_to_ns.patch kprobes-enable-booster-on-the-preemptible-kernel.patch hotplug-cpu-clean-up-hotcpu_notifier-use.patch remove-kernel-lockdepclockdep_internal.patch remove-the-old-bd_mutex-lockdep-annotation.patch new-bd_mutex-lockdep-annotation.patch remove-lock_key-approach-to-managing-nested-bd_mutex-locks.patch simplify-some-aspects-of-bd_mutex-nesting.patch use-mutex_lock_nested-for-bd_mutex-to-avoid-lockdep-warning.patch avoid-lockdep-warning-in-md.patch fix-generic-warn_on-message.patch schedc-correct-comment-for-this_rq_lock-routine.patch sched-fix-migration-cost-estimator.patch sched-domain-move-sched-group-allocations-to-percpu-area.patch move_task_off_dead_cpu-should-be-called-with-disabled-ints.patch sched-domain-increase-the-smt-busy-rebalance-interval.patch sched-avoid-taking-rq-lock-in-wake_priority_sleeper.patch sched-remove-staggering-of-load-balancing.patch sched-disable-interrupts-for-locking-in-load_balance.patch sched-extract-load-calculation-from-rebalance_tick.patch sched-move-idle-status-calculation-into-rebalance_tick.patch sched-use-softirq-for-load-balancing.patch sched-call-tasklet-less-frequently.patch sched-add-option-to-serialize-load-balancing.patch sched-add-option-to-serialize-load-balancing-fix.patch sched-improve-migration-accuracy.patch sched-improve-migration-accuracy-tidy.patch sched-decrease-number-of-load-balances.patch mm-only-sched-add-a-few-scheduler-event-counters.patch sched-optimize-activate_task-for-rt-task.patch kernel-schedc-whitespace-cleanups.patch kernel-schedc-whitespace-cleanups-more.patch sched-add-above-background-load-function.patch mm-implement-swap-prefetching.patch mm-implement-swap-prefetching-use-ctl_unnumbered.patch sched-cleanup-remove-task_t-convert-to-struct-task_struct-prefetch.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 updated-hrtimers-state-tracking.patch updated-hrtimers-clean-up-callback-tracking.patch updated-hrtimers-move-and-add-documentation.patch updated-add-a-framework-to-manage-clock-event-devices.patch updated-acpi-include-apich.patch updated-acpi-keep-track-of-timer-broadcast.patch updated-acpi-add-state-propagation-for-dynamic-broadcasting.patch updated-i386-cleanup-apic-code.patch updated-i386-convert-to-clock-event-devices.patch updated-pm_timer-allow-early-access-and-move-externs-to-a-header-file.patch updated-i386-rework-local-apic-calibration.patch updated-high-res-timers-core.patch updated-gtod-mark-tsc-unusable-for-highres-timers.patch updated-dynticks-core-code.patch updated-dyntick-add-nohz-stats-to-proc-stat.patch updated-dynticks-i386-arch-code.patch updated-dynticks-fix-nmi-watchdog.patch updated-high-res-timers-dynticks-enable-i386-support.patch updated-debugging-feature-timer-stats.patch clockevents-core-check-for-clock-event-device-handler-being-non-null-before-calling-it.patch round_jiffies-infrastructure.patch round_jiffies-infrastructure-fix.patch clocksource-add-usage-of-config_sysfs.patch clocksource-small-cleanup-2.patch clocksource-small-cleanup-2-fix.patch clocksource-small-acpi_pm-cleanup.patch detect-atomic-counter-underflows.patch debug-shared-irqs.patch make-frame_pointer-default=y.patch mutex-subsystem-synchro-test-module.patch vdso-print-fatal-signals.patch vdso-improve-print_fatal_signals-support-by-adding-memory-maps.patch vdso-print-fatal-signals-use-ctl_unnumbered.patch lockdep-show-held-locks-when-showing-a-stackdump.patch lockdep-show-held-locks-when-showing-a-stackdump-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