diff -r 4a3bddd74f36 -r e197009ddb96 src/arch/alpha/ev5.cc
--- a/src/arch/alpha/ev5.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/arch/alpha/ev5.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -289,7 +289,7 @@
       case IPR_IPLR:
 #ifdef DEBUG
         if (break_ipl != -1 && break_ipl == (int)(val & 0x1f))
-            debug_break();
+            Debug::breakpoint();
 #endif
 
         // only write least significant five bits - interrupt level
diff -r 4a3bddd74f36 -r e197009ddb96 src/base/debug.hh
--- a/src/base/debug.hh	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/base/debug.hh	Tue Dec 21 08:23:35 2010 -0800
@@ -31,6 +31,10 @@
 #ifndef __BASE_DEBUG_HH__
 #define __BASE_DEBUG_HH__
 
-void debug_break();
+namespace Debug {
+
+void breakpoint();
+
+/* namespace Debug */ }
 
 #endif // __BASE_DEBUG_HH__
diff -r 4a3bddd74f36 -r e197009ddb96 src/base/debug.cc
--- a/src/base/debug.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/base/debug.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -34,12 +34,16 @@
 
 #include "base/cprintf.hh"
 
+namespace Debug {
+
 void
-debug_break()
+breakpoint()
 {
 #ifndef NDEBUG
     kill(getpid(), SIGTRAP);
 #else
-    cprintf("debug_break suppressed, compiled with NDEBUG\n");
+    cprintf("Debug::breakpoint suppressed, compiled with NDEBUG\n");
 #endif
 }
+
+/* namespace Debug */ }
diff -r 4a3bddd74f36 -r e197009ddb96 src/base/statistics.cc
--- a/src/base/statistics.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/base/statistics.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -130,7 +130,7 @@
 {
     id = id_count++;
     if (debug_break_id >= 0 and debug_break_id == id)
-        debug_break();
+        Debug::breakpoint();
 }
 
 Info::~Info()
diff -r 4a3bddd74f36 -r e197009ddb96 src/cpu/pc_event.cc
--- a/src/cpu/pc_event.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/cpu/pc_event.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -132,7 +132,7 @@
 {
     StringWrap name(tc->getCpuPtr()->name() + ".break_event");
     DPRINTFN("break event %s triggered\n", descr());
-    debug_break();
+    Debug::breakpoint();
     if (remove)
         delete this;
 }
diff -r 4a3bddd74f36 -r e197009ddb96 src/dev/ns_gige.cc
--- a/src/dev/ns_gige.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/dev/ns_gige.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -937,7 +937,7 @@
 
     intrTick = when;
     if (intrTick < curTick) {
-        debug_break();
+        Debug::breakpoint();
         intrTick = curTick;
     }
 
@@ -1705,7 +1705,7 @@
                             udp->sum(cksum(udp));
                             txUdpChecksums++;
                         } else {
-                            debug_break();
+                            Debug::breakpoint();
                             warn_once("UDPPKT set, but not UDP!\n");
                         }
                     } else if (extsts & EXTSTS_TCPPKT) {
@@ -1715,7 +1715,7 @@
                             tcp->sum(cksum(tcp));
                             txTcpChecksums++;
                         } else {
-                            debug_break();
+                            Debug::breakpoint();
                             warn_once("TCPPKT set, but not UDP!\n");
                         }
                     }
@@ -1725,7 +1725,7 @@
                             ip->sum(cksum(ip));
                             txIpChecksums++;
                         } else {
-                            debug_break();
+                            Debug::breakpoint();
                             warn_once("IPPKT set, but not UDP!\n");
                         }
                     }
diff -r 4a3bddd74f36 -r e197009ddb96 src/dev/sinic.cc
--- a/src/dev/sinic.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/dev/sinic.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -687,7 +687,7 @@
 
     intrTick = when;
     if (intrTick < curTick) {
-        debug_break();
+        Debug::breakpoint();
         intrTick = curTick;
     }
 
diff -r 4a3bddd74f36 -r e197009ddb96 src/sim/debug.cc
--- a/src/sim/debug.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/sim/debug.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -67,14 +67,14 @@
 void
 DebugBreakEvent::process()
 {
-    debug_break();
+    Debug::breakpoint();
 }
 
 
 const char *
 DebugBreakEvent::description() const
 {
-    return "debug break";
+    return "debug breakpoint";
 }
 
 //
diff -r 4a3bddd74f36 -r e197009ddb96 src/sim/pseudo_inst.cc
--- a/src/sim/pseudo_inst.cc	Tue Dec 21 08:02:41 2010 -0800
+++ b/src/sim/pseudo_inst.cc	Tue Dec 21 08:23:35 2010 -0800
@@ -317,7 +317,7 @@
 void
 debugbreak(ThreadContext *tc)
 {
-    debug_break();
+    Debug::breakpoint();
 }
 
 void