From: Andrew Morton <akpm@linux-foundation.org>

argh.

Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/i386/kernel/sched-clock.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/kernel/sched-clock.c~fix-x86_64-mm-sched-clock-share arch/i386/kernel/sched-clock.c
--- a/arch/i386/kernel/sched-clock.c~fix-x86_64-mm-sched-clock-share
+++ a/arch/i386/kernel/sched-clock.c
@@ -171,9 +171,9 @@ static int sc_freq_event(struct notifier
 	struct sc_data *sc = &per_cpu(sc_data, freq->cpu);
 
 	if (cpu_has(&cpu_data[freq->cpu], X86_FEATURE_CONSTANT_TSC))
-		return;
+		return NOTIFY_DONE;
 	if (freq->old == freq->new)
-		return;
+		return NOTIFY_DONE;
 
 	switch (event) {
 	case CPUFREQ_SUSPENDCHANGE:
_