From patchwork Wed Sep 3 21:19:02 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Pinski X-Patchwork-Id: 36643 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9BD5F202E4 for ; Wed, 3 Sep 2014 21:21:03 +0000 (UTC) Received: by mail-oi0-f72.google.com with SMTP id e131sf42577648oig.7 for ; Wed, 03 Sep 2014 14:21:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=aAxZSSH6uCLH0xspggdtrQLBCT5rjFm6uX3Alc0kPlo=; b=H6QERAT07DdglPJQW1TcwU6E0lnTphBs1bMa434ekyZnoeHBRNmY44Kx3JNNJouAyA +Ns9gEJPewlxbPrnD6k6L2bqVUx84DAAVuPPN6MSx7EvvkOJKLYtCXr6tZTwWNU0Qh52 I9JIGmmOtpiFgwaXaD+zTrDA30BKpdXDfjv8XA5KeiBujpt+FeZ+ubX17FImnGZe66LH elriHfY2SVMallRN7Ix1VXyamE+7obRVVzDOFuuTE3seUJ2575xEORFt2rQ0IZnPX/OU 6iv/Owl7rvnU38LLhiJzTJdoeB3OybnC0s18GEyteaIm7cjgkCR0bUpYKeuoXXYT4tk3 JN3w== X-Gm-Message-State: ALoCoQlIJZEHMuzuhBTfgaYGGBOo1g1LbaPyODcyugTCUqI8WAHFZtUvDmh3EeCOSZDjoPf/AUD0 X-Received: by 10.42.133.200 with SMTP id i8mr95324ict.14.1409779263183; Wed, 03 Sep 2014 14:21:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.81.200 with SMTP id f66ls14864qgd.24.gmail; Wed, 03 Sep 2014 14:21:03 -0700 (PDT) X-Received: by 10.52.246.198 with SMTP id xy6mr15210vdc.7.1409779263027; Wed, 03 Sep 2014 14:21:03 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id ej9si4457363vcb.25.2014.09.03.14.21.02 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 03 Sep 2014 14:21:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) client-ip=209.85.220.182; Received: by mail-vc0-f182.google.com with SMTP id im17so9497320vcb.41 for ; Wed, 03 Sep 2014 14:21:02 -0700 (PDT) X-Received: by 10.52.129.165 with SMTP id nx5mr2755vdb.25.1409779262926; Wed, 03 Sep 2014 14:21:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.45.67 with SMTP id uj3csp740167vcb; Wed, 3 Sep 2014 14:21:02 -0700 (PDT) X-Received: by 10.70.60.169 with SMTP id i9mr83135pdr.166.1409779262013; Wed, 03 Sep 2014 14:21:02 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z13si13610922pdi.2.2014.09.03.14.20.58 for ; Wed, 03 Sep 2014 14:20:59 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932567AbaICVUp (ORCPT + 26 others); Wed, 3 Sep 2014 17:20:45 -0400 Received: from mail-ig0-f170.google.com ([209.85.213.170]:35715 "EHLO mail-ig0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756518AbaICVT2 (ORCPT ); Wed, 3 Sep 2014 17:19:28 -0400 Received: by mail-ig0-f170.google.com with SMTP id h3so6106igd.5 for ; Wed, 03 Sep 2014 14:19:27 -0700 (PDT) X-Received: by 10.42.230.144 with SMTP id jm16mr95868icb.68.1409779167036; Wed, 03 Sep 2014 14:19:27 -0700 (PDT) Received: from localhost.localdomain (64.2.3.195.ptr.us.xo.net. [64.2.3.195]) by mx.google.com with ESMTPSA id rq5sm6522832igb.12.2014.09.03.14.19.25 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 03 Sep 2014 14:19:26 -0700 (PDT) Received: from localhost.localdomain (apinskidesktop [127.0.0.1]) by localhost.localdomain (8.14.3/8.14.3/Debian-9.4) with ESMTP id s83LJOw5031043 (version=TLSv1/SSLv3 cipher=DHE-DSS-AES256-SHA bits=256 verify=NO); Wed, 3 Sep 2014 14:19:24 -0700 Received: (from apinski@localhost) by localhost.localdomain (8.14.3/8.14.3/Submit) id s83LJOnP031042; Wed, 3 Sep 2014 14:19:24 -0700 From: Andrew Pinski To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, pinskia@gmail.com Cc: Andrew Pinski Subject: [PATCH 08/24] Allow a 32bit ABI to use the naming of the 64bit ABI syscalls to avoid confusion of not splitting the registers Date: Wed, 3 Sep 2014 14:19:02 -0700 Message-Id: <1409779158-30963-9-git-send-email-apinski@cavium.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1409779158-30963-1-git-send-email-apinski@cavium.com> References: <1409779158-30963-1-git-send-email-apinski@cavium.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: apinski@cavium.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , In the ARM64 ILP32 case, we want to say the syscalls that normally would pass 64bit as two arguments are now passing as one so want to use the 64bit naming scheme. Signed-off-by: Andrew Pinski --- include/uapi/asm-generic/unistd.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/include/uapi/asm-generic/unistd.h b/include/uapi/asm-generic/unistd.h index 11d11bc..a7984a0 100644 --- a/include/uapi/asm-generic/unistd.h +++ b/include/uapi/asm-generic/unistd.h @@ -881,8 +881,12 @@ __SYSCALL(__NR_fork, sys_ni_syscall) * they take different names. * Here we map the numbers so that both versions * use the same syscall table layout. + * For 32bit abis where 64bit can be passed via one + * register, use the same naming as the 64bit ones + * as they will only have a 64 bit off_t. */ -#if __BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT) +#if (__BITS_PER_LONG == 64 && !defined(__SYSCALL_COMPAT)) || \ + defined(__ARCH_WANT_64BIT_SYSCALLS) #define __NR_fcntl __NR3264_fcntl #define __NR_statfs __NR3264_statfs #define __NR_fstatfs __NR3264_fstatfs