# Node ID 47efc3192cf59834f6b7221809c5730b66fc6306
# Parent  98b159114648f80ab5fc85c2e748a4415751c08b
diff --git a/src/cpu/kvm/SConscript b/src/cpu/kvm/SConscript
--- a/src/cpu/kvm/SConscript
+++ b/src/cpu/kvm/SConscript
@@ -39,29 +39,29 @@
 
 Import('*')
 
+SimObject('KvmVM.py')
+SimObject('BaseKvmCPU.py')
+
+Source('base.cc')
+Source('vm.cc')
+Source('perfevent.cc')
+Source('timer.cc')
+
+DebugFlag('Kvm', 'Basic KVM Functionality')
+DebugFlag('KvmContext', 'KVM/gem5 context synchronization')
+DebugFlag('KvmIO', 'KVM MMIO diagnostics')
+DebugFlag('KvmInt', 'KVM Interrupt handling')
+DebugFlag('KvmRun', 'KvmRun entry/exit diagnostics')
+DebugFlag('KvmTimer', 'KVM timing')
+
+CompoundFlag('KvmAll', [ 'Kvm', 'KvmContext', 'KvmRun',
+                         'KvmIO', 'KvmInt', 'KvmTimer' ],
+             'All KVM debug flags')
+
 if env['USE_KVM']:
-    SimObject('KvmVM.py')
-    SimObject('BaseKvmCPU.py')
-
-    Source('base.cc')
-    Source('vm.cc')
-    Source('perfevent.cc')
-    Source('timer.cc')
-
     if env['TARGET_ISA'] == 'arm':
         SimObject('ArmKvmCPU.py')
         Source('arm_cpu.cc')
     elif env['TARGET_ISA'] == 'x86':
         SimObject('X86KvmCPU.py')
         Source('x86_cpu.cc')
-
-    DebugFlag('Kvm', 'Basic KVM Functionality')
-    DebugFlag('KvmContext', 'KVM/gem5 context synchronization')
-    DebugFlag('KvmIO', 'KVM MMIO diagnostics')
-    DebugFlag('KvmInt', 'KVM Interrupt handling')
-    DebugFlag('KvmRun', 'KvmRun entry/exit diagnostics')
-    DebugFlag('KvmTimer', 'KVM timing')
-
-    CompoundFlag('KvmAll', [ 'Kvm', 'KvmContext', 'KvmRun',
-                             'KvmIO', 'KvmInt', 'KvmTimer' ],
-                 'All KVM debug flags')