Merge remote-tracking branch 'upstream/master'

1 files changed, 10 insertions, 4 deletions

diff --git a/configure b/configure
index abba75ea1..919d6f883 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in d26927e.
+# From configure.in c4af60e.
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.69.
 #
@@ -1333,9 +1333,15 @@ Optional Features:
                           in conjunction with XEN or Other Virtualization
                           mechanisms) Note: Please ensure that you've disabled
                           dynamic CPU-Frequencys, such as power saving
-                          options. (On the most modern Dedicated Servers
-                          cpufreq is preconfigured, see your distribution's
-                          manual how to disable it)
+                          options. (On most modern Dedicated Servers cpufreq
+                          is preconfigured, see your distribution's manual how
+                          to disable it). Furthermore, If your CPU has
+                          built-in CPU-Frequency scaling features (such as
+                          Intel's SpeedStep(R)), do not enable this option.
+                          Recent CPUs (Intel Core or newer) guarantee a fixed
+                          increment rate for their TSC, so it should be safe
+                          to use, but please doublecheck the documentation of
+                          both your CPU and OS before enabling this option.
   --enable-profiler=ARG   Profilers: no, gprof (disabled by default)
   --disable-64bit         Enforce 32bit output on x86_64 systems.
   --enable-lto            Enables or Disables Linktime Code Optimization (LTO