From 1630f0bad2a9185974604a4437e8bc224625cc8c Mon Sep 17 00:00:00 2001 From: Will Drewry Date: Sat, 14 Jul 2012 10:32:52 -0500 Subject: [PATCH] --- yaml --- r: 311949 b: refs/heads/master c: 09d314425f5bc69fcf793c7890d9e6a3cdcb44be h: refs/heads/master i: 311947: 74f41289a41faab47b1118287f3bf3e56738c1e2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/vsyscall_64.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f96b872679c7..1e4cec6ce02d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a7559b13de77d720903c1b1d45cd3b5b0b30a643 +refs/heads/master: 09d314425f5bc69fcf793c7890d9e6a3cdcb44be diff --git a/trunk/arch/x86/kernel/vsyscall_64.c b/trunk/arch/x86/kernel/vsyscall_64.c index 08a18d0dcc5a..5db36caf4289 100644 --- a/trunk/arch/x86/kernel/vsyscall_64.c +++ b/trunk/arch/x86/kernel/vsyscall_64.c @@ -139,6 +139,7 @@ static int addr_to_vsyscall_nr(unsigned long addr) return nr; } +#ifdef CONFIG_SECCOMP static int vsyscall_seccomp(struct task_struct *tsk, int syscall_nr) { if (!seccomp_mode(&tsk->seccomp)) @@ -147,6 +148,9 @@ static int vsyscall_seccomp(struct task_struct *tsk, int syscall_nr) task_pt_regs(tsk)->ax = syscall_nr; return __secure_computing(syscall_nr); } +#else +#define vsyscall_seccomp(_tsk, _nr) 0 +#endif static bool write_ok_or_segv(unsigned long ptr, size_t size) {