From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Sat, 23 Oct 2004 20:13:55 +0000 (+0000)
Subject: Disabled surplus allocation feature of the CKRM cpu scheduler.
X-Git-Tag: before-enable-kexec-patch~31
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e055bd9a38845a82a555a22af617d0ed0494e700;p=linux-2.6.git

Disabled surplus allocation feature of the CKRM cpu scheduler.
See PL2642 for further details.
---

diff --git a/kernel/ckrm/ckrm_cpu_monitor.c b/kernel/ckrm/ckrm_cpu_monitor.c
index 259b9c9bb..5095c1c30 100644
--- a/kernel/ckrm/ckrm_cpu_monitor.c
+++ b/kernel/ckrm/ckrm_cpu_monitor.c
@@ -929,8 +929,12 @@ void ckrm_cpu_monitor(int check_min)
 	if (update_max_demand(root_core) != 0)
 		goto outunlock;
 	
+#ifndef ALLOC_SURPLUS_SUPPORT
+#warning "MEF taking out alloc_surplus"
+#else
 	if (alloc_surplus(root_core) != 0)
 		goto outunlock;
+#endif
 	
 	adjust_local_weight();