From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Sat, 20 Aug 2005 19:52:33 +0000 (+0000)
Subject: - remove last vestiges of lkcd patch (kexec functionality subsumed by
X-Git-Tag: before-fedora-2_6_18-1_2239_FC5-vs2_0_2_2-rc6-merge~143
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=76ece9d357f960256c0df7a7e83bc8f0b61f1f21;p=linux-2.6.git

- remove last vestiges of lkcd patch (kexec functionality subsumed by
  kexec patch applied by alk, the rest of it never worked anyway)
- sync fedora branch:  will help future merges
---

diff --git a/kernel/timer.c b/kernel/timer.c
index a2cf1e917..4233f79b0 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -32,8 +32,6 @@
 #include <linux/jiffies.h>
 #include <linux/posix-timers.h>
 #include <linux/cpu.h>
-#include <linux/vs_cvirt.h>
-#include <linux/vserver/sched.h>
 #include <linux/syscalls.h>
 #include <linux/delay.h>
 #include <linux/diskdump.h>
@@ -1263,9 +1261,6 @@ asmlinkage long sys_sysinfo(struct sysinfo __user *info)
 		val.procs = nr_threads;
 	} while (read_seqretry(&xtime_lock, seq));
 
-/*	if (vx_flags(VXF_VIRT_CPU, 0))
-		vx_vsi_cpu(val);
-*/
 	si_meminfo(&val);
 	si_swapinfo(&val);