X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fres_counter.c;h=c7eaa37a768b785cf69cd2eb64ab3fb75c052124;hb=5a0e3ad6af8660be21ca98a971cd00f331318c05;hp=e1338f074314d7e85fca035ac4ab55f20704b8cd;hpb=c5b947b28828e82814605824e5db0bc58d66d8c0;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/res_counter.c b/kernel/res_counter.c
index e1338f0..c7eaa37 100644
--- a/kernel/res_counter.c
+++ b/kernel/res_counter.c
@@ -10,7 +10,6 @@
 #include <linux/types.h>
 #include <linux/parser.h>
 #include <linux/fs.h>
-#include <linux/slab.h>
 #include <linux/res_counter.h>
 #include <linux/uaccess.h>
 #include <linux/mm.h>
@@ -19,6 +18,7 @@ void res_counter_init(struct res_counter *counter, struct res_counter *parent)
 {
 	spin_lock_init(&counter->lock);
 	counter->limit = RESOURCE_MAX;
+	counter->soft_limit = RESOURCE_MAX;
 	counter->parent = parent;
 }
 
@@ -101,6 +101,8 @@ res_counter_member(struct res_counter *counter, int member)
 		return &counter->limit;
 	case RES_FAILCNT:
 		return &counter->failcnt;
+	case RES_SOFT_LIMIT:
+		return &counter->soft_limit;
 	};
 
 	BUG();