X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_yaffs1.c;fp=yaffs_yaffs1.c;h=4d10096374ef9f7ac42d9065defcceb0ffd78d67;hp=b6c43e5ef3571c88c4e8a25b1698fa4efa372bee;hb=fb1a7ee223619260cfd9b6366fd78747cc572cd5;hpb=84f122f301b6a27295641fcbde3a6fbcfea78a99

diff --git a/yaffs_yaffs1.c b/yaffs_yaffs1.c
index b6c43e5..4d10096 100644
--- a/yaffs_yaffs1.c
+++ b/yaffs_yaffs1.c
@@ -86,7 +86,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 	for (blk = dev->internal_start_block;
 	     !alloc_failed && blk <= dev->internal_end_block; blk++) {
 
-		YYIELD();
+		cond_resched();
 
 		bi = yaffs_get_block_info(dev, blk);
 		state = bi->block_state;
@@ -217,9 +217,9 @@ int yaffs1_scan(struct yaffs_dev *dev)
 
 					struct yaffs_shadow_fixer *fixer;
 					fixer =
-					    YMALLOC(sizeof
-						    (struct
-						     yaffs_shadow_fixer));
+						kmalloc(sizeof
+						(struct yaffs_shadow_fixer),
+						GFP_NOFS);
 					if (fixer) {
 						fixer->next = shadow_fixers;
 						shadow_fixers = fixer;
@@ -422,7 +422,7 @@ int yaffs1_scan(struct yaffs_dev *dev)
 			if (obj)
 				yaffs_update_oh(obj, NULL, 1, 0, 0, NULL);
 
-			YFREE(fixer);
+			kfree(fixer);
 		}
 	}