3 files changed, 7 insertions, 11 deletions
diff --git a/src/arch/arm/remote_gdb.hh b/src/arch/arm/remote_gdb.hh
index 56a50a133..1e6420633 100644
--- a/src/arch/arm/remote_gdb.hh
+++ b/src/arch/arm/remote_gdb.hh
@@ -76,9 +76,6 @@ enum {
     GDB64_NUMREGS = 98
 };
 
-const int GDB_REG_BYTES = std::max(GDB64_NUMREGS * sizeof(uint64_t),
-                                   GDB32_NUMREGS * sizeof(uint32_t));
-
 class RemoteGDB : public BaseRemoteGDB
 {
   protected:
@@ -89,6 +86,9 @@ class RemoteGDB : public BaseRemoteGDB
     void setregs();
 
   public:
+    const int GDB_REG_BYTES = std::max(GDB64_NUMREGS * sizeof(uint64_t),
+                                       GDB32_NUMREGS * sizeof(uint32_t));
+
     RemoteGDB(System *_system, ThreadContext *tc);
 };
 } // namespace ArmISA
diff --git a/src/arch/x86/remote_gdb.hh b/src/arch/x86/remote_gdb.hh
index f09d1e012..0f41055cd 100644
--- a/src/arch/x86/remote_gdb.hh
+++ b/src/arch/x86/remote_gdb.hh
@@ -111,6 +111,10 @@ class RemoteGDB : public BaseRemoteGDB
         GDB64_NUMREGS = (GDB64_GS_32 + 1) / 2 + 1
     };
 
+    const int GDB_REG_BYTES =
+        std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t),
+                 RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t));
+
     RemoteGDB(System *system, ThreadContext *context);
 
     bool acc(Addr addr, size_t len);
@@ -122,10 +126,6 @@ class RemoteGDB : public BaseRemoteGDB
     bool checkBpLen(size_t len) { return len == 1; }
 };
 
-const int GDB_REG_BYTES =
-    std::max(RemoteGDB::GDB32_NUMREGS * sizeof(uint32_t),
-             RemoteGDB::GDB64_NUMREGS * sizeof(uint64_t));
-
 }
 
 #endif // __ARCH_X86_REMOTEGDB_HH__
diff --git a/src/dev/etherpkt.hh b/src/dev/etherpkt.hh
index 16576d329..febd303a1 100644
--- a/src/dev/etherpkt.hh
+++ b/src/dev/etherpkt.hh
@@ -68,10 +68,6 @@ class EthPacketData
         : data(new uint8_t[size]), length(0)
     { }
 
-    EthPacketData(std::auto_ptr<uint8_t> d, int l)
-        : data(d.release()), length(l)
-    { }
-
     ~EthPacketData() { if (data) delete [] data; }
 
   public: