From: Enrico Scholz Date: Tue, 19 Oct 2004 21:47:13 +0000 (+0000) Subject: updated to vs1.9.3-rc4 X-Git-Tag: IPSENTINEL_VERSION_0_12~245 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f607be337375590196eeaae3ddd50fc461bc38d;p=util-vserver.git updated to vs1.9.3-rc4 git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1747 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/kernel/context.h b/util-vserver/kernel/context.h index 94692ba..4061e7b 100644 --- a/util-vserver/kernel/context.h +++ b/util-vserver/kernel/context.h @@ -168,6 +168,8 @@ extern int vc_set_cflags(uint32_t, void __user *); #define VXF_FORK_RSS (1ULL<<48) #define VXF_PROLIFIC (1ULL<<49) +#define VXF_IGNEG_NICE (1ULL<<52) + #define VXF_ONE_TIME (0x0003ULL<<32) #define VCMD_get_ccaps VC_CMD(FLAGS, 3, 0) @@ -191,6 +193,7 @@ extern int vc_set_ccaps(uint32_t, void __user *); #define VXC_RAW_ICMP 0x00000100 #define VXC_SECURE_MOUNT 0x00010000 +#define VXC_SECURE_REMOUNT 0x00020000 #endif /* _VX_CONTEXT_H */ diff --git a/util-vserver/kernel/cvirt.h b/util-vserver/kernel/cvirt.h index 1f83546..1c3e340 100644 --- a/util-vserver/kernel/cvirt.h +++ b/util-vserver/kernel/cvirt.h @@ -21,7 +21,7 @@ struct _vx_cvirt { uint32_t onhold_last; /* jiffies when put on hold */ struct timespec bias_idle; - uint64_t bias_jiffies; /* context creation point */ + struct timespec bias_uptime; /* context creation point */ struct new_utsname utsname; @@ -62,7 +62,7 @@ static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt) { uint64_t idle_jiffies = vx_idle_jiffies(); - cvirt->bias_jiffies = get_jiffies_64(); + do_posix_clock_monotonic_gettime(&cvirt->bias_uptime); jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle); atomic_set(&cvirt->nr_threads, 0); atomic_set(&cvirt->nr_running, 0); @@ -121,7 +121,9 @@ static inline int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer) int a, b, c; length += sprintf(buffer + length, - "BiasJiffies:\t%lld\n", (long long int)cvirt->bias_jiffies); + "BiasUptime:\t%lu.%02lu\n", + (unsigned long)cvirt->bias_uptime.tv_sec, + (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); length += sprintf(buffer + length, "SysName:\t%.*s\n" "NodeName:\t%.*s\n"