---

yaml --- r: 88749 b: refs/heads/master c: eee6dd1 h: refs/heads/master i: 88747: a105061 v: v3
git-mirror · Apr 17, 2008 · 092360b · 092360b
1 parent 4f1959c
commit 092360b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e907f48980d6668f99206ba0dded40dca2d086f
+refs/heads/master: eee6dd15723639f9270e4c561a0c82e8e18bd587
diff --git a/trunk/arch/x86/kernel/signal_32.c b/trunk/arch/x86/kernel/signal_32.c
@@ -342,13 +342,6 @@ get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, size_t frame_size)
 	return (void __user *) sp;
 }
 
-/*
- * These symbols are defined with the addresses in the vsyscall page.
- * See vsyscall-sigreturn.S.
- */
-extern void __user __kernel_sigreturn;
-extern void __user __kernel_rt_sigreturn;
-
 static int
 setup_frame(int sig, struct k_sigaction *ka, sigset_t *set,
 	    struct pt_regs *regs)

diff --git a/trunk/include/asm-x86/vdso.h b/trunk/include/asm-x86/vdso.h
@@ -25,4 +25,11 @@ extern const char VDSO32_PRELINK[];
 	(void *) (VDSO32_##name - VDSO32_PRELINK + (unsigned long) (base)); })
 #endif
 
+/*
+ * These symbols are defined with the addresses in the vsyscall page.
+ * See vsyscall-sigreturn.S.
+ */
+extern void __user __kernel_sigreturn;
+extern void __user __kernel_rt_sigreturn;
+
 #endif	/* asm-x86/vdso.h */