diff --git a/[refs] b/[refs]
index 69e8e23b15be..1185d93c531d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 080909503664641432cc8adf2ee2084775fd992a
+refs/heads/master: 80de7c3138ee9fd86a98696fd2cf7ad89b995d0a
diff --git a/trunk/mm/mempolicy.c b/trunk/mm/mempolicy.c
index bd92431d4c49..4ada3be6e252 100644
--- a/trunk/mm/mempolicy.c
+++ b/trunk/mm/mempolicy.c
@@ -2562,7 +2562,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol, int no_context)
 		break;
 
 	default:
-		BUG();
+		return -EINVAL;
 	}
 
 	l = strlen(policy_modes[mode]);