BugLink: http://bugs.launchpad.net/bugs/727459

This is part of the changes that have been found while syncing up
the patchsets. Apparently when applying the endif went into the
wrong place and causes the clock to be assumed always stable. Which
causes problems on certain CPUs (probably the fork/clone hang as well
as processes getting stuck for a longer time).

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
arch/x86/kernel/cpu/intel.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 0aad121..f582b21 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -97,8 +97,8 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
#ifndef CONFIG_XEN
if (!check_tsc_unstable())
-#endif
sched_clock_stable = 1;
+#endif
}

/*
--
1.7.0.4


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team