From 7f85cd30d84ac498ff815d822544f776f73aa677 Mon Sep 17 00:00:00 2001
From: Roland McGrath <roland@redhat.com>
Date: Wed, 9 Apr 2008 01:29:27 -0700
Subject: [PATCH] --- yaml --- r: 88573 b: refs/heads/master c:
 1a3e4ca41c5a38975023a6e8831c309d3322889c h: refs/heads/master i:   88571:
 367887d92cacf11b6cbe3a3a0930fa7e5e33d17c v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/ia32/ia32_signal.c | 2 +-
 trunk/arch/x86/kernel/signal_32.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b9639988dd50..ab833a259da7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 85eb69a16aab5a394ce043c2131319eae35e6493
+refs/heads/master: 1a3e4ca41c5a38975023a6e8831c309d3322889c
diff --git a/trunk/arch/x86/ia32/ia32_signal.c b/trunk/arch/x86/ia32/ia32_signal.c
index 5e7771a3ba2f..05e155d3fb6c 100644
--- a/trunk/arch/x86/ia32/ia32_signal.c
+++ b/trunk/arch/x86/ia32/ia32_signal.c
@@ -468,7 +468,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka,
 		restorer = ka->sa.sa_restorer;
 	} else {
 		/* Return stub is in 32bit vsyscall page */
-		if (current->binfmt->hasvdso)
+		if (current->mm->context.vdso)
 			restorer = VDSO32_SYMBOL(current->mm->context.vdso,
 						 sigreturn);
 		else
diff --git a/trunk/arch/x86/kernel/signal_32.c b/trunk/arch/x86/kernel/signal_32.c
index 0157a6f0f41f..011c62fa563c 100644
--- a/trunk/arch/x86/kernel/signal_32.c
+++ b/trunk/arch/x86/kernel/signal_32.c
@@ -365,7 +365,7 @@ static int setup_frame(int sig, struct k_sigaction *ka,
 			goto give_sigsegv;
 	}
 
-	if (current->binfmt->hasvdso)
+	if (current->mm->context.vdso)
 		restorer = VDSO32_SYMBOL(current->mm->context.vdso, sigreturn);
 	else
 		restorer = &frame->retcode;