Merge to Fedora kernel-2.6.7-1.494 and VServer 1.9.1.12. Fix some previous merge...

[linux-2.6.git] / init / main.c

diff --git a/init/main.c b/init/main.c
index 09c99e8..5c3a795 100644 (file)
--- a/init/main.c
+++ b/init/main.c
@@ -50,8 +50,11 @@
 #include <asm/setup.h>
 
 #include <linux/ckrm.h>
+#ifdef CONFIG_CKRM_CPU_SCHEDULE
 int __init init_ckrm_sched_res(void);
-
+#else
+#define init_ckrm_sched_res() ((void)0)
+#endif
 
 /*
  * This is one of the first .c files built. Error out early