1 From 9c400d0ee1489eb2242183568343c906fdff4781 Mon Sep 17 00:00:00 2001
2 From: S.Çağlar Onur <caglar@cs.princeton.edu>
3 Date: Tue, 7 Dec 2010 11:09:05 -0500
4 Subject: [PATCH] linux-2.6-580-show-proc-virt.patch
7 kernel/vserver/context.c | 2 +-
8 kernel/vserver/network.c | 2 +-
9 2 files changed, 2 insertions(+), 2 deletions(-)
11 diff --git a/kernel/vserver/context.c b/kernel/vserver/context.c
12 index 4b49403..b0e2bd4 100644
13 --- a/kernel/vserver/context.c
14 +++ b/kernel/vserver/context.c
15 @@ -433,7 +433,7 @@ int get_xid_list(int index, unsigned int *xids, int size)
16 int hindex, nr_xids = 0;
18 /* only show current and children */
19 - if (!vx_check(0, VS_ADMIN | VS_WATCH)) {
20 + if (!vx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
23 xids[nr_xids] = vx_current_xid();
24 diff --git a/kernel/vserver/network.c b/kernel/vserver/network.c
25 index 3f5a766..a374522 100644
26 --- a/kernel/vserver/network.c
27 +++ b/kernel/vserver/network.c
28 @@ -392,7 +392,7 @@ int get_nid_list(int index, unsigned int *nids, int size)
29 int hindex, nr_nids = 0;
31 /* only show current and children */
32 - if (!nx_check(0, VS_ADMIN | VS_WATCH)) {
33 + if (!nx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) {
36 nids[nr_nids] = nx_current_nid();