| Message ID | 20161108183956.4521-2-khuey@kylehuey.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Nov 08, 2016 at 10:39:50AM -0800, Kyle Huey wrote: <--- Add commit message here. > Signed-off-by: Kyle Huey <khuey@kylehuey.com> > --- > arch/x86/kernel/process_64.c | 3 ++- > arch/x86/um/syscalls_64.c | 3 ++- > 2 files changed, 4 insertions(+), 2 deletions(-) ... > void arch_switch_to(struct task_struct *to) > { > if ((to->thread.arch.fs == 0) || (to->mm == NULL)) > return; > > base-commit: e3a00f68e426df24a5fb98956a1bd1b23943aa1e This looks like some tracking thing. It gets ignored by tools though...
On Wed, Nov 9, 2016 at 1:47 AM, Borislav Petkov <bp@suse.de> wrote: > On Tue, Nov 08, 2016 at 10:39:50AM -0800, Kyle Huey wrote: > > <--- Add commit message here. > >> Signed-off-by: Kyle Huey <khuey@kylehuey.com> >> --- >> arch/x86/kernel/process_64.c | 3 ++- >> arch/x86/um/syscalls_64.c | 3 ++- >> 2 files changed, 4 insertions(+), 2 deletions(-) > > ... > >> void arch_switch_to(struct task_struct *to) >> { >> if ((to->thread.arch.fs == 0) || (to->mm == NULL)) >> return; >> >> base-commit: e3a00f68e426df24a5fb98956a1bd1b23943aa1e > > This looks like some tracking thing. It gets ignored by tools though... Yeah despite git format-patch generating it, git doesn't automatically honor it when applying patches. - Kyle -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b3760b3..2718cf9 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -30,16 +30,17 @@ #include <linux/ptrace.h> #include <linux/notifier.h> #include <linux/kprobes.h> #include <linux/kdebug.h> #include <linux/prctl.h> #include <linux/uaccess.h> #include <linux/io.h> #include <linux/ftrace.h> +#include <linux/syscalls.h> #include <asm/pgtable.h> #include <asm/processor.h> #include <asm/fpu/internal.h> #include <asm/mmu_context.h> #include <asm/prctl.h> #include <asm/desc.h> #include <asm/proto.h> @@ -607,17 +608,17 @@ long do_arch_prctl(struct task_struct *task, int code, unsigned long addr) default: ret = -EINVAL; break; } return ret; } -long sys_arch_prctl(int code, unsigned long addr) +SYSCALL_DEFINE2(arch_prctl, int, code, unsigned long, addr) { return do_arch_prctl(current, code, addr); } unsigned long KSTK_ESP(struct task_struct *task) { return task_pt_regs(task)->sp; } diff --git a/arch/x86/um/syscalls_64.c b/arch/x86/um/syscalls_64.c index e655227..ab3f7f4 100644 --- a/arch/x86/um/syscalls_64.c +++ b/arch/x86/um/syscalls_64.c @@ -1,16 +1,17 @@ /* * Copyright (C) 2003 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) * Copyright 2003 PathScale, Inc. * * Licensed under the GPL */ #include <linux/sched.h> +#include <linux/syscalls.h> #include <linux/uaccess.h> #include <asm/prctl.h> /* XXX This should get the constants from libc */ #include <os.h> long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) { unsigned long *ptr = addr, tmp; long ret; @@ -67,17 +68,17 @@ long arch_prctl(struct task_struct *task, int code, unsigned long __user *addr) case ARCH_GET_GS: ret = put_user(tmp, addr); break; } return ret; } -long sys_arch_prctl(int code, unsigned long addr) +SYSCALL_DEFINE2(arch_prctl, int, code, unsigned long, addr) { return arch_prctl(current, code, (unsigned long __user *) addr); } void arch_switch_to(struct task_struct *to) { if ((to->thread.arch.fs == 0) || (to->mm == NULL)) return;
Signed-off-by: Kyle Huey <khuey@kylehuey.com> --- arch/x86/kernel/process_64.c | 3 ++- arch/x86/um/syscalls_64.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) base-commit: e3a00f68e426df24a5fb98956a1bd1b23943aa1e