Index: lib/CodeGen/MachineScheduler.cpp
===================================================================
--- lib/CodeGen/MachineScheduler.cpp
+++ lib/CodeGen/MachineScheduler.cpp
@@ -349,12 +349,16 @@
 }
 
 bool PostMachineScheduler::runOnMachineFunction(MachineFunction &mf) {
-  if (skipOptnoneFunction(*mf.getFunction()))
-    return false;
-
-  if (!mf.getSubtarget().enablePostRAScheduler()) {
-    DEBUG(dbgs() << "Subtarget disables post-MI-sched.\n");
-    return false;
+  if (EnableMachineSched.getNumOccurrences()) {
+    if (!EnableMachineSched)
+      return false;
+  } else {
+    if (skipOptnoneFunction(*mf.getFunction()))
+      return false;
+    if (!mf.getSubtarget().enablePostRAScheduler()) {
+      DEBUG(dbgs() << "Subtarget disables post-MI-sched.\n");
+      return false;
+    }
   }
   DEBUG(dbgs() << "Before post-MI-sched:\n"; mf.print(dbgs()));