This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / include / linux / vs_cvirt.h

diff --git a/include/linux/vs_cvirt.h b/include/linux/vs_cvirt.h
index 07c3e86..65f4303 100644 (file)
--- a/include/linux/vs_cvirt.h
+++ b/include/linux/vs_cvirt.h
@@ -1,10 +1,18 @@
 #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 */
 
@@ -28,8 +36,7 @@ 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)) {
-               vxlprintk(VXD_CBIT(cvirt, 2),
-                       "vx_map_tgid: %p/%llx: %d -> %d",
+               vxdprintk("vx_map_tgid: %p/%llx: %d -> %d in %s:%d\n",
                        vxi, vxi->vx_flags, pid,
                        (pid == vxi->vx_initpid)?1:pid,
                        file, line);
@@ -46,8 +53,7 @@ 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)) {
-               vxlprintk(VXD_CBIT(cvirt, 2),
-                       "vx_rmap_tgid: %p/%llx: %d -> %d",
+               vxdprintk("vx_rmap_tgid: %p/%llx: %d -> %d in %s:%d\n",
                        vxi, vxi->vx_flags, pid,
                        (pid == 1)?vxi->vx_initpid:pid,
                        file, line);
@@ -57,6 +63,8 @@ static inline int __vx_rmap_tgid(struct vx_info *vxi, int pid,
        return pid;
 }
 
+#undef vxdprintk
+#define vxdprintk(x...)
 
 #else
 #warning duplicate inclusion