diff --git a/llvm/lib/CodeGen/CMakeLists.txt b/llvm/lib/CodeGen/CMakeLists.txt
--- a/llvm/lib/CodeGen/CMakeLists.txt
+++ b/llvm/lib/CodeGen/CMakeLists.txt
@@ -187,6 +187,8 @@
   RegUsageInfoPropagate.cpp
   ReplaceWithVeclib.cpp
   ResetMachineFunctionPass.cpp
+  RegisterBank.cpp
+  RegisterBankInfo.cpp
   SafeStack.cpp
   SafeStackLayout.cpp
   ScheduleDAG.cpp
diff --git a/llvm/lib/CodeGen/GlobalISel/CMakeLists.txt b/llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
--- a/llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
+++ b/llvm/lib/CodeGen/GlobalISel/CMakeLists.txt
@@ -22,8 +22,6 @@
   LostDebugLocObserver.cpp
   MachineIRBuilder.cpp
   RegBankSelect.cpp
-  RegisterBank.cpp
-  RegisterBankInfo.cpp
   Utils.cpp
 
   ADDITIONAL_HEADER_DIRS
diff --git a/llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp b/llvm/lib/CodeGen/RegisterBank.cpp
rename from llvm/lib/CodeGen/GlobalISel/RegisterBank.cpp
rename to llvm/lib/CodeGen/RegisterBank.cpp
diff --git a/llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp b/llvm/lib/CodeGen/RegisterBankInfo.cpp
rename from llvm/lib/CodeGen/GlobalISel/RegisterBankInfo.cpp
rename to llvm/lib/CodeGen/RegisterBankInfo.cpp