Merge with Linux 2.3.32.

1 files changed, 6 insertions, 14 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 405cf8f88..bc0378697 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -1047,20 +1047,12 @@ static int __kmem_cache_shrink(kmem_cache_t *cachep)
 int
 kmem_cache_shrink(kmem_cache_t *cachep)
 {
-	if (!cachep) {
-		printk(KERN_ERR "kmem_shrink: NULL ptr\n");
-		return 2;
-	}
-	if (in_interrupt()) {
-		printk(KERN_ERR "kmem_shrink: Called during int - %s\n", cachep->c_name);
-		return 2;
-	}
-
-	if (!is_chained_kmem_cache(cachep)) {
-		printk(KERN_ERR "kmem_shrink: Invalid cache addr %p\n",
-		       cachep);
-		return 2;
-	}
+	if (!cachep)
+		BUG();
+	if (in_interrupt())
+		BUG();
+	if (!is_chained_kmem_cache(cachep))
+		BUG();
 
 	return __kmem_cache_shrink(cachep);
 }