diff --git a/[refs] b/[refs]
index 8187e80d9972..0ef13fc391fb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b308bf3be1f75207c307eea9ada90e0b76194911
+refs/heads/master: f911c685d65ea1855eb3f95b8eaf871e5d9342fa
diff --git a/trunk/arch/mn10300/mm/misalignment.c b/trunk/arch/mn10300/mm/misalignment.c
index 614c32b6325b..066ddc625a14 100644
--- a/trunk/arch/mn10300/mm/misalignment.c
+++ b/trunk/arch/mn10300/mm/misalignment.c
@@ -543,7 +543,7 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
 {
 	unsigned long *postinc = NULL, address = 0, tmp;
 
-	params &= 0x7fffffff;
+	params &= 0x00ffffff;
 
 	do {
 		switch (params & 0xff) {
@@ -631,6 +631,7 @@ static int misalignment_addr(unsigned long *registers, unsigned params,
 			address += disp;
 			break;
 		default:
+			BUG();
 			return 0;
 		}
 	} while ((params >>= 8));
@@ -697,6 +698,7 @@ static int misalignment_reg(unsigned long *registers, unsigned params,
 		break;
 
 	default:
+		BUG();
 		return 0;
 	}