diff --git a/[refs] b/[refs]
index ab833a259da7..f56331dd5f20 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1a3e4ca41c5a38975023a6e8831c309d3322889c
+refs/heads/master: 5de253cc5b1f565f7aeb5bacd67bac37e943ceef
diff --git a/trunk/arch/x86/vdso/vdso32-setup.c b/trunk/arch/x86/vdso/vdso32-setup.c
index 348f1341e1c8..f7e78d84fc01 100644
--- a/trunk/arch/x86/vdso/vdso32-setup.c
+++ b/trunk/arch/x86/vdso/vdso32-setup.c
@@ -325,6 +325,9 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
 	int ret = 0;
 	bool compat;
 
+	if (vdso_enabled == VDSO_DISABLED)
+		return 0;
+
 	down_write(&mm->mmap_sem);
 
 	/* Test compat mode once here, in case someone