X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fcvirt.h;h=7beeaaa7b78fa509166259b9b6a26f0872742caf;hb=9bf4aaab3e101692164d49b7ca357651eb691cb6;hp=ba3a2535620474422b833df90d2c62847c113513;hpb=db216c3d5e4c040e557a50f8f5d35d5c415e8c1c;p=linux-2.6.git

diff --git a/include/linux/vserver/cvirt.h b/include/linux/vserver/cvirt.h
index ba3a25356..7beeaaa7b 100644
--- a/include/linux/vserver/cvirt.h
+++ b/include/linux/vserver/cvirt.h
@@ -1,3 +1,5 @@
+/* _VX_CVIRT_H defined below */
+
 #if	defined(__KERNEL__) && defined(_VX_INFO_DEF_)
 
 #include <linux/utsname.h>
@@ -11,9 +13,7 @@
 struct _vx_cvirt {
 	int max_threads;
 
-	unsigned int bias_cswtch;
 	struct timespec bias_idle;
-	struct timespec bias_tp;
 	uint64_t bias_jiffies;
 
 	struct new_utsname utsname;
@@ -52,11 +52,8 @@ static inline void vx_info_init_cvirt(struct _vx_cvirt *cvirt)
 {
 	uint64_t idle_jiffies = vx_idle_jiffies();
 
-	// new->virt.bias_cswtch = kstat.context_swtch;
 	cvirt->bias_jiffies = get_jiffies_64();
-
 	jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle);
-	do_posix_clock_monotonic_gettime(&cvirt->bias_tp);
 
 	down_read(&uts_sem);
 	cvirt->utsname = system_utsname;
@@ -89,6 +86,22 @@ static inline void vx_info_exit_cacct(struct _vx_cacct *cacct)
 static inline int vx_info_proc_cvirt(struct _vx_cvirt *cvirt, char *buffer)
 {
 	int length = 0;
+	length += sprintf(buffer + length,
+		"BiasJiffies:\t%lld\n", (long long int)cvirt->bias_jiffies);
+	length += sprintf(buffer + length,
+		"SysName:\t%.*s\n"
+		"NodeName:\t%.*s\n"
+		"Release:\t%.*s\n"
+		"Version:\t%.*s\n"
+		"Machine:\t%.*s\n"
+		"DomainName:\t%.*s\n"
+		,__NEW_UTS_LEN, cvirt->utsname.sysname
+		,__NEW_UTS_LEN, cvirt->utsname.nodename
+		,__NEW_UTS_LEN, cvirt->utsname.release
+		,__NEW_UTS_LEN, cvirt->utsname.version
+		,__NEW_UTS_LEN, cvirt->utsname.machine
+		,__NEW_UTS_LEN, cvirt->utsname.domainname
+		);
 	return length;
 }