Merge zizzer.eecs.umich.edu:/bk/m5

[gem5.git] / base / remote_gdb.cc

diff --git a/base/remote_gdb.cc b/base/remote_gdb.cc
index 484a019445dbf03f6e1ae93de4d644abd8aa9729..c3590920a8f8558ac6860e40539203aec654b2f1 100644 (file)
--- a/base/remote_gdb.cc
+++ b/base/remote_gdb.cc
@@ -116,22 +116,20 @@
 
 #include <sys/signal.h>
 
-#include <unistd.h>
-
 #include <cstdio>
 #include <string>
+#include <unistd.h>
 
-#include "cpu/exec_context.hh"
 #include "base/intmath.hh"
 #include "base/kgdb.h"
-
-#include "mem/functional_mem/physical_memory.hh"
 #include "base/remote_gdb.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"
-#include "targetarch/vtophys.hh"
-#include "sim/system.hh"
+#include "cpu/exec_context.hh"
 #include "cpu/static_inst.hh"
+#include "mem/functional/physical.hh"
+#include "sim/system.hh"
+#include "targetarch/vtophys.hh"
 
 using namespace std;