From d842fbe3b01c1c320eacce02a5b446b27a5238c6 Mon Sep 17 00:00:00 2001 From: Andy Bavier Date: Fri, 4 Apr 2008 18:04:28 +0000 Subject: [PATCH] Copy from trunk --- linux-2.6-580-show-proc-virt.patch | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 linux-2.6-580-show-proc-virt.patch diff --git a/linux-2.6-580-show-proc-virt.patch b/linux-2.6-580-show-proc-virt.patch new file mode 100644 index 000000000..d6e7bd9f4 --- /dev/null +++ b/linux-2.6-580-show-proc-virt.patch @@ -0,0 +1,24 @@ +diff -Nurp linux-2.6.22-570/kernel/vserver/context.c linux-2.6.22-580/kernel/vserver/context.c +--- linux-2.6.22-570/kernel/vserver/context.c 2008-02-15 20:36:20.000000000 +0100 ++++ linux-2.6.22-580/kernel/vserver/context.c 2008-02-15 20:39:37.000000000 +0100 +@@ -406,7 +406,7 @@ int get_xid_list(int index, unsigned int + int hindex, nr_xids = 0; + + /* only show current and children */ +- if (!vx_check(0, VS_ADMIN | VS_WATCH)) { ++ if (!vx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) { + if (index > 0) + return 0; + xids[nr_xids] = vx_current_xid(); +diff -Nurp linux-2.6.22-570/kernel/vserver/network.c linux-2.6.22-580/kernel/vserver/network.c +--- linux-2.6.22-570/kernel/vserver/network.c 2008-02-15 20:36:20.000000000 +0100 ++++ linux-2.6.22-580/kernel/vserver/network.c 2008-02-15 20:40:34.000000000 +0100 +@@ -390,7 +390,7 @@ int get_nid_list(int index, unsigned int + int hindex, nr_nids = 0; + + /* only show current and children */ +- if (!nx_check(0, VS_ADMIN | VS_WATCH)) { ++ if (!nx_check(0, VS_ADMIN | VS_WATCH) && vx_flags(VXF_HIDE_VINFO, 0)) { + if (index > 0) + return 0; + nids[nr_nids] = nx_current_nid(); -- 2.47.0