- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / kernel / sysctl_binary.c

diff --git a/kernel/sysctl_binary.c b/kernel/sysctl_binary.c
index 8829f33..06fe210 100644 (file)
--- a/kernel/sysctl_binary.c
+++ b/kernel/sysctl_binary.c
@@ -873,6 +873,15 @@ static const struct bin_table bin_bus_table[] = {
 };
 
 
+#ifdef CONFIG_XEN
+#include <xen/sysctl.h>
+static const struct bin_table bin_xen_table[] = {
+       { CTL_INT,      CTL_XEN_INDEPENDENT_WALLCLOCK,  "independent_wallclock" },
+       { CTL_ULONG,    CTL_XEN_PERMITTED_CLOCK_JITTER, "permitted_clock_jitter" },
+       {}
+};
+#endif
+
 static const struct bin_table bin_s390dbf_table[] = {
        { CTL_INT,      5678 /* CTL_S390DBF_STOPPABLE */, "debug_stoppable" },
        { CTL_INT,      5679 /* CTL_S390DBF_ACTIVE */,    "debug_active" },
@@ -912,6 +921,9 @@ static const struct bin_table bin_root_table[] = {
        { CTL_DIR,      CTL_BUS,        "bus",          bin_bus_table },
        { CTL_DIR,      CTL_ABI,        "abi" },
        /* CTL_CPU not used */
+#ifdef CONFIG_XEN
+       { CTL_DIR,      CTL_XEN,        "xen",          bin_xen_table },
+#endif
        /* CTL_ARLAN "arlan" no longer used */
        { CTL_DIR,      CTL_S390DBF,    "s390dbf",      bin_s390dbf_table },
        { CTL_DIR,      CTL_SUNRPC,     "sunrpc",       bin_sunrpc_table },