diff --git a/lib/CodeGen/Passes.cpp b/lib/CodeGen/Passes.cpp
index c62227535fc..914c78b0b14 100644
--- a/lib/CodeGen/Passes.cpp
+++ b/lib/CodeGen/Passes.cpp
@@ -57,8 +57,8 @@ FunctionPass *llvm::createRegisterAllocator(CodeGenOpt::Level OptLevel) {
 
   // This forces linking of the greedy register allocator, so -regalloc=greedy
   // works in clang.
-  if (Ctor == createGreedyRegisterAllocator)
-    return createGreedyRegisterAllocator();
+  if (Ctor == createLinearScanRegisterAllocator)
+    return createLinearScanRegisterAllocator();
 
   if (Ctor != createDefaultRegisterAllocator)
     return Ctor();
@@ -68,6 +68,6 @@ FunctionPass *llvm::createRegisterAllocator(CodeGenOpt::Level OptLevel) {
   case CodeGenOpt::None:
     return createFastRegisterAllocator();
   default:
-    return createLinearScanRegisterAllocator();
+    return createGreedyRegisterAllocator();
   }
 }