git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
include
/
linux
/
vs_cvirt.h
diff --git
a/include/linux/vs_cvirt.h
b/include/linux/vs_cvirt.h
index
65f4303
..
07c3e86
100644
(file)
--- 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
#ifndef _VX_VS_CVIRT_H
#define _VX_VS_CVIRT_H
-
-// #define VX_DEBUG
-
#include "vserver/cvirt.h"
#include "vserver/cvirt.h"
+#include "vserver/debug.h"
#include "vs_base.h"
#include "vs_base.h"
-#if defined(VX_DEBUG)
-#define vxdprintk(x...) printk("vxd: " x)
-#else
-#define vxdprintk(x...)
-#endif
-
/* utsname virtualization */
/* 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)) {
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);
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)) {
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);
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;
}
return pid;
}
-#undef vxdprintk
-#define vxdprintk(x...)
#else
#warning duplicate inclusion
#else
#warning duplicate inclusion