diff --git a/ChangeLog b/ChangeLog
index 5fceec53c42a881fbd00a88d13bc9eb81fab0384..0a65851ff001a720173d4741b732816424dfa1d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-02  Adam Jackson  <ajax@freedesktop.org>
+
+	* hw/xfree86/dri/dri.c:
+	Coverity #983: Move some risky debugging code inside #ifdef 
+	DEBUG.
+
 2006-04-02  Adam Jackson  <ajax@freedesktop.org>
 
 	* GL/glx/glxcmds.c:
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c
index 8d28510339a4a474a90f8b7b49c3d9f4fadf1a36..b58b670a2aca90de3e8d11c76cafd1501dced6d8 100644
--- a/hw/xfree86/dri/dri.c
+++ b/hw/xfree86/dri/dri.c
@@ -1427,7 +1427,6 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
     DRISyncType       syncType;
 #ifdef DEBUG
     static int        count = 0;
-#endif
 
     if (!newContext) {
 	DRIDrvMsg(pScreen->myNum, X_ERROR,
@@ -1436,7 +1435,6 @@ DRISwapContext(int drmFD, void *oldctx, void *newctx)
 	return;
     }
 
-#ifdef DEBUG
     /* usefull for debugging, just print out after n context switches */
     if (!count || !(count % 1)) {
 	DRIDrvMsg(pScreen->myNum, X_INFO,