From patchwork Mon Nov 28 03:05:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Huey X-Patchwork-Id: 9449005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6C4496071B for ; Mon, 28 Nov 2016 03:06:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5C2372074F for ; Mon, 28 Nov 2016 03:06:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5077221050; Mon, 28 Nov 2016 03:06:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E7F642074F for ; Mon, 28 Nov 2016 03:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754261AbcK1DGE (ORCPT ); Sun, 27 Nov 2016 22:06:04 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33862 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753990AbcK1DFm (ORCPT ); Sun, 27 Nov 2016 22:05:42 -0500 Received: by mail-pf0-f196.google.com with SMTP id y68so5562910pfb.1 for ; Sun, 27 Nov 2016 19:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2kJP+BQ4K9z583lK1hd9xbbBF3QMKlYpOckZYLRIYtk=; b=AAsoZPLQPEcCMjEgRy50KYVPE5/239ShFkK+tzbCw2KGAOxjUHx+geyEV6NZnzDGRd UN7npSss6Gsf7cRCWsjkhmXS1U3dsPCeRRB9/6seJNa0mxtiuQF57KiJ65gx1CA6uF6G NUn9GpPJ58X44LKSWoIUeXinRgxQSERybaR0qBr9xhMPxm9639zKggNqF1l/De3rItHu rxjA+aob5Eme3JvF6Tz0nfIazBTGkgz8Q+ur7iNP4cC8vZMMtWxUK+92DsNkgvv2pxEz jRMVBYR5xGG4vGnL9Nhpf29RgAmyiteaXKwU0CuvFcsbR6ZgSdEliBXKKAqxsUMXzTQw wveQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2kJP+BQ4K9z583lK1hd9xbbBF3QMKlYpOckZYLRIYtk=; b=IVo+CH84Yxtyvj/He4oRBPblti4IsWXywJw//HyFKUdwAuv7cTMz8nCGzmsvQA46uM yJ63Q1yTyyAUlxRMyseXoTi4eqlXR+xBoQrJmZMFTUObt4LjEHyffY5Dv+Z3b7jWLvxH +vUUPeWP8Pi5b9fDF2HVkhxSQbVHa6nBBO/HBOaVBtNi3Oc1vHxxKaKrZDiq7J0anL5l ENMzveTUinCQmeXxQbtdbKLdoWYAiuFjeSg086muoonoE8S+tw5N6kayBPis0oUjeSd/ 30qhgWBo1dJWLxB8Hz1eN82UYPhY8h0mSINYoA+Rp6rfBEkm7UxSM+tp2tIl4NzqOd9l YFLA== X-Gm-Message-State: AKaTC02TtNumy6sLazGb7RS5sPhmgEnfRRO7ZS9o2o5hOGc+DxTznAA/G2AQKFddkW5cUw== X-Received: by 10.84.218.70 with SMTP id f6mr17019314plm.142.1480302341960; Sun, 27 Nov 2016 19:05:41 -0800 (PST) Received: from minbar.hsd1.ca.comcast.net (c-73-162-102-141.hsd1.ca.comcast.net. [73.162.102.141]) by smtp.gmail.com with ESMTPSA id l7sm82734316pfg.35.2016.11.27.19.05.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 27 Nov 2016 19:05:41 -0800 (PST) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Robert O'Callahan , Thomas Gleixner , Andy Lutomirski , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Jeff Dike , Richard Weinberger , Alexander Viro , Shuah Khan , Dave Hansen , Borislav Petkov , Peter Zijlstra , Boris Ostrovsky , Len Brown , "Rafael J. Wysocki" , Dmitry Safonov , David Matlack , Nadav Amit , Andi Kleen Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v13 1/8] x86/arch_prctl/64: Use SYSCALL_DEFINE2 to define sys_arch_prctl Date: Sun, 27 Nov 2016 19:05:14 -0800 Message-Id: <20161128030521.4423-2-khuey@kylehuey.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161128030521.4423-1-khuey@kylehuey.com> References: <20161128030521.4423-1-khuey@kylehuey.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use the SYSCALL_DEFINE2 macro instead of manually defining it. Signed-off-by: Kyle Huey --- arch/x86/kernel/process_64.c | 3 ++- arch/x86/um/syscalls_64.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) base-commit: e5517c2a5a49ed5e99047008629f1cd60246ea0e 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 #include #include #include #include #include #include #include +#include #include #include #include #include #include #include #include @@ -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 +#include #include #include /* XXX This should get the constants from libc */ #include 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;