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
Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...
[linux-2.6.git]
/
kernel
/
vserver
/
proc.c
diff --git
a/kernel/vserver/proc.c
b/kernel/vserver/proc.c
index
3d27dd8
..
19b2cc6
100644
(file)
--- a/
kernel/vserver/proc.c
+++ b/
kernel/vserver/proc.c
@@
-217,8
+217,10
@@
int proc_nid_status (int vid, char *buffer)
length = sprintf(buffer,
"UseCnt:\t%d\n"
"Tasks:\t%d\n"
length = sprintf(buffer,
"UseCnt:\t%d\n"
"Tasks:\t%d\n"
+ "Flags:\t%016llx\n"
,atomic_read(&nxi->nx_usecnt)
,atomic_read(&nxi->nx_tasks)
,atomic_read(&nxi->nx_usecnt)
,atomic_read(&nxi->nx_tasks)
+ ,(unsigned long long)nxi->nx_flags
);
put_nx_info(nxi);
return length;
);
put_nx_info(nxi);
return length;