X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_cvirt.h;h=07c3e862024fde234d029cbea0e120221f6572dd;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=65f4303625fb7c438b483bf087b035709a8eefb7;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/include/linux/vs_cvirt.h b/include/linux/vs_cvirt.h
index 65f430362..07c3e8620 100644
--- a/include/linux/vs_cvirt.h
+++ b/include/linux/vs_cvirt.h
@@ -1,18 +1,10 @@
 #ifndef _VX_VS_CVIRT_H
 #define _VX_VS_CVIRT_H
 
-
-// #define VX_DEBUG
-
 #include "vserver/cvirt.h"
+#include "vserver/debug.h"
 #include "vs_base.h"
 
-#if defined(VX_DEBUG)
-#define vxdprintk(x...) printk("vxd: " x)
-#else
-#define vxdprintk(x...)
-#endif
-
 
 /* utsname virtualization */
 
@@ -36,7 +28,8 @@ static inline int __vx_map_tgid(struct vx_info *vxi, int pid,
 	char *file, int line)
 {
 	if (vxi && __vx_flags(vxi->vx_flags, VXF_INFO_INIT, 0)) {
-		vxdprintk("vx_map_tgid: %p/%llx: %d -> %d in %s:%d\n",
+		vxlprintk(VXD_CBIT(cvirt, 2),
+			"vx_map_tgid: %p/%llx: %d -> %d",
 			vxi, vxi->vx_flags, pid,
 			(pid == vxi->vx_initpid)?1:pid,
 			file, line);
@@ -53,7 +46,8 @@ static inline int __vx_rmap_tgid(struct vx_info *vxi, int pid,
 	char *file, int line)
 {
 	if (vxi && __vx_flags(vxi->vx_flags, VXF_INFO_INIT, 0)) {
-		vxdprintk("vx_rmap_tgid: %p/%llx: %d -> %d in %s:%d\n",
+		vxlprintk(VXD_CBIT(cvirt, 2),
+			"vx_rmap_tgid: %p/%llx: %d -> %d",
 			vxi, vxi->vx_flags, pid,
 			(pid == 1)?vxi->vx_initpid:pid,
 			file, line);
@@ -63,8 +57,6 @@ static inline int __vx_rmap_tgid(struct vx_info *vxi, int pid,
 	return pid;
 }
 
-#undef	vxdprintk
-#define vxdprintk(x...)
 
 #else
 #warning duplicate inclusion