diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 9b4304fa3..1141c8d5c 100755
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -95,12 +95,11 @@ static long cmm_alloc_pages(long nr, long *counter,
 		(*counter)++;
 		spin_unlock(&cmm_lock);
 		nr--;
-		cond_resched();
 	}
 	return nr;
 }
 
-static long __cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
+static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
 {
 	struct cmm_page_array *pa;
 	unsigned long addr;
@@ -124,21 +123,6 @@ static long __cmm_free_pages(long nr, long *counter, struct cmm_page_array **lis
 	return nr;
 }
 
-static long cmm_free_pages(long nr, long *counter, struct cmm_page_array **list)
-{
-	long inc = 0;
-
-	while (nr) {
-		inc = min(256L, nr);
-		nr -= inc;
-		inc = __cmm_free_pages(inc, counter, list);
-		if (inc)
-			break;
-		cond_resched();
-	}
-	return nr + inc;
-}
-
 static int cmm_oom_notify(struct notifier_block *self,
 			  unsigned long dummy, void *parm)
 {