[Valgrind-developers] Valgrind: r16429 - in /branches/VALGRIND_3_13_BRANCH: ./ coregrind/m_options.c

[<sv...@va...>]

Author: sewardj
Date: Thu Jun  1 06:49:50 2017
New Revision: 16429

Log:
Merge from trunk, r16428:
  Back out r16414 (Enable fair scheduling by default on Linux.)

Modified:
    branches/VALGRIND_3_13_BRANCH/   (props changed)
    branches/VALGRIND_3_13_BRANCH/coregrind/m_options.c

Modified: branches/VALGRIND_3_13_BRANCH/coregrind/m_options.c
==============================================================================
--- branches/VALGRIND_3_13_BRANCH/coregrind/m_options.c (original)
+++ branches/VALGRIND_3_13_BRANCH/coregrind/m_options.c Thu Jun  1 06:49:50 2017
@@ -105,13 +105,8 @@
 Bool   VG_(clo_debug_dump_line) = False;
 Bool   VG_(clo_debug_dump_frames) = False;
 Bool   VG_(clo_trace_redir)    = False;
-
-#if defined(VGO_linux)
-enum FairSchedType VG_(clo_fair_sched) = enable_fair_sched;
-#else
-enum FairSchedType VG_(clo_fair_sched) = disable_fair_sched;
-#endif
-
+enum FairSchedType
+       VG_(clo_fair_sched)     = disable_fair_sched;
 Bool   VG_(clo_trace_sched)    = False;
 Bool   VG_(clo_profile_heap)   = False;
 Int    VG_(clo_core_redzone_size) = CORE_REDZONE_DEFAULT_SZB;