From: Andrew Morton <akpm@osdl.org>

Cc: David Gibson <dwg@au1.ibm.com>
Cc: William Lee Irwin III <wli@holomorphy.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 mm/hugetlb.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff -puN mm/hugetlb.c~hugepage-small-fixes-to-hugepage-clear-copy-path-tidy mm/hugetlb.c
--- devel/mm/hugetlb.c~hugepage-small-fixes-to-hugepage-clear-copy-path-tidy	2006-02-27 20:16:00.000000000 -0800
+++ devel-akpm/mm/hugetlb.c	2006-02-27 20:16:00.000000000 -0800
@@ -33,9 +33,7 @@ static void clear_huge_page(struct page 
 
 	might_sleep();
 	for (i = 0; i < (HPAGE_SIZE/PAGE_SIZE); i++) {
-		if (need_resched())
-			schedule();
-
+		cond_resched();
 		clear_user_highpage(page + i, addr);
 	}
 }
@@ -47,8 +45,7 @@ static void copy_huge_page(struct page *
 
 	might_sleep();
 	for (i = 0; i < HPAGE_SIZE/PAGE_SIZE; i++) {
-		if (need_resched())
-			schedule();
+		cond_resched();
 		copy_user_highpage(dst + i, src + i, addr + i*PAGE_SIZE);
 	}
 }
_