From 84af673635f7b9002fdaca00bef8bf4070c277bd Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Thu, 6 Sep 2012 12:01:00 -0400
Subject: [PATCH] --- yaml --- r: 322513 b: refs/heads/master c:
 80de7c3138ee9fd86a98696fd2cf7ad89b995d0a h: refs/heads/master i:   322511:
 91616db7a2ee6495ff1db17b2c11df7a80c7957f v: v3

---
 [refs]               | 2 +-
 trunk/mm/mempolicy.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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]);