diff --git a/[refs] b/[refs]
index 562994c78f21..3c1ac6e31a73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fb0a685cb95a0267a96153af2f72486f27be5847
+refs/heads/master: aacb3d17a73f6447c04e4d769391238dcf85568d
diff --git a/trunk/fs/exec.c b/trunk/fs/exec.c
index f8fad7fc0e5f..01829a1cb766 100644
--- a/trunk/fs/exec.c
+++ b/trunk/fs/exec.c
@@ -277,7 +277,7 @@ static int __bprm_mm_init(struct linux_binprm *bprm)
 	 * use STACK_TOP because that can depend on attributes which aren't
 	 * configured yet.
 	 */
-	BUG_ON(VM_STACK_FLAGS & VM_STACK_INCOMPLETE_SETUP);
+	BUILD_BUG_ON(VM_STACK_FLAGS & VM_STACK_INCOMPLETE_SETUP);
 	vma->vm_end = STACK_TOP_MAX;
 	vma->vm_start = vma->vm_end - PAGE_SIZE;
 	vma->vm_flags = VM_STACK_FLAGS | VM_STACK_INCOMPLETE_SETUP;