diff --git a/[refs] b/[refs]
index 35e1d0914d43..183149365f46 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7223bb4a829628bdf37d544ed4363d99bac1ade6
+refs/heads/master: bb005a59e08733bb416126dc184f73120fc6366b
diff --git a/trunk/mm/nommu.c b/trunk/mm/nommu.c
index 57ae6126b29a..92e1a47d1e52 100644
--- a/trunk/mm/nommu.c
+++ b/trunk/mm/nommu.c
@@ -1376,15 +1376,15 @@ unsigned long do_mmap_pgoff(struct file *file,
 		if (capabilities & BDI_CAP_MAP_DIRECT) {
 			addr = file->f_op->get_unmapped_area(file, addr, len,
 							     pgoff, flags);
-			if (IS_ERR((void *) addr)) {
+			if (IS_ERR_VALUE(addr)) {
 				ret = addr;
-				if (ret != (unsigned long) -ENOSYS)
+				if (ret != -ENOSYS)
 					goto error_just_free;
 
 				/* the driver refused to tell us where to site
 				 * the mapping so we'll have to attempt to copy
 				 * it */
-				ret = (unsigned long) -ENODEV;
+				ret = -ENODEV;
 				if (!(capabilities & BDI_CAP_MAP_COPY))
 					goto error_just_free;