From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753156AbeADIDk (ORCPT + 1 other); Thu, 4 Jan 2018 03:03:40 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:53593 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753129AbeADIDi (ORCPT ); Thu, 4 Jan 2018 03:03:38 -0500 From: Christoph Hellwig To: linux-aio@kvack.org Cc: Avi Kivity , linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/6] move _body_io_syscall to the generic syscall.h Date: Thu, 4 Jan 2018 09:03:21 +0100 Message-Id: <20180104080325.14716-3-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180104080325.14716-1-hch@lst.de> References: <20180104080325.14716-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: This way it can be used for the fallback 6-argument version on all architectures. Signed-off-by: Christoph Hellwig --- src/syscall-generic.h | 6 ------ src/syscall.h | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/syscall-generic.h b/src/syscall-generic.h index 24d7c7c..35b8580 100644 --- a/src/syscall-generic.h +++ b/src/syscall-generic.h @@ -2,12 +2,6 @@ #include #include -#define _body_io_syscall(sname, args...) \ -{ \ - int ret = syscall(__NR_##sname, ## args); \ - return ret < 0 ? -errno : ret; \ -} - #define io_syscall1(type,fname,sname,type1,arg1) \ type fname(type1 arg1) \ _body_io_syscall(sname, (long)arg1) diff --git a/src/syscall.h b/src/syscall.h index a2da030..3819519 100644 --- a/src/syscall.h +++ b/src/syscall.h @@ -10,6 +10,13 @@ #define DEFSYMVER(compat_sym, orig_sym, ver_sym) \ __asm__(".symver " SYMSTR(compat_sym) "," SYMSTR(orig_sym) "@@LIBAIO_" SYMSTR(ver_sym)); +/* generic fallback */ +#define _body_io_syscall(sname, args...) \ +{ \ + int ret = syscall(__NR_##sname, ## args); \ + return ret < 0 ? -errno : ret; \ +} + #if defined(__i386__) #include "syscall-i386.h" #elif defined(__x86_64__) -- 2.14.2