Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755481AbZKNJpG (ORCPT ); Sat, 14 Nov 2009 04:45:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755293AbZKNJpF (ORCPT ); Sat, 14 Nov 2009 04:45:05 -0500 Received: from chilli.pcug.org.au ([203.10.76.44]:34204 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755245AbZKNJpD (ORCPT ); Sat, 14 Nov 2009 04:45:03 -0500 Date: Sat, 14 Nov 2009 20:45:06 +1100 From: Stephen Rothwell To: Andrew Morton , Linus Cc: Peter Zijlstra , "Joseph S. Myers" , linux-api@vger.kernel.org, lkml , Oleg Nesterov , Stephane Eranian , Michael Kerrisk , Roland McGrath , Al Viro , Christoph Hellwig , Ingo Molnar , Ulrich Drepper Subject: [PATCH v2] fcntl: Use consistent values for F_[GS]ETOWN_EX Message-Id: <20091114204506.12d3a3c8.sfr@canb.auug.org.au> In-Reply-To: <20091114180131.da95d2a1.sfr@canb.auug.org.au> References: <1254691822.21044.9.camel@laptop> <20091030161320.17d07dc9.sfr@canb.auug.org.au> <20091030162906.fbc1c40b.sfr@canb.auug.org.au> <20091113103257.1f4f6e12.sfr@canb.auug.org.au> <20091114180131.da95d2a1.sfr@canb.auug.org.au> X-Mailer: Sylpheed 2.7.1 (GTK+ 2.18.3; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2246 Lines: 72 These values were only introduced during this release cycle, so it is still early enough to get them right. alpha uses the same values that are in asm-generic/fcntl.h, so just remove them. parisc uses the values interchanged for no apparent reason, so remove them to give us consistency across all architectures. Signed-off-by: Stephen Rothwell --- arch/alpha/include/asm/fcntl.h | 2 -- arch/parisc/include/asm/fcntl.h | 2 -- include/asm-generic/fcntl.h | 2 -- 3 files changed, 0 insertions(+), 6 deletions(-) Ulrich pointed out that using F_LINUX_SPECIFIC_BASE for these make code less efficient when these values are used in switch statements. diff --git a/arch/alpha/include/asm/fcntl.h b/arch/alpha/include/asm/fcntl.h index 73126e4..25da001 100644 --- a/arch/alpha/include/asm/fcntl.h +++ b/arch/alpha/include/asm/fcntl.h @@ -26,8 +26,6 @@ #define F_GETOWN 6 /* for sockets. */ #define F_SETSIG 10 /* for sockets. */ #define F_GETSIG 11 /* for sockets. */ -#define F_SETOWN_EX 15 -#define F_GETOWN_EX 16 /* for posix fcntl() and lockf() */ #define F_RDLCK 1 diff --git a/arch/parisc/include/asm/fcntl.h b/arch/parisc/include/asm/fcntl.h index 5f39d55..1e1c824 100644 --- a/arch/parisc/include/asm/fcntl.h +++ b/arch/parisc/include/asm/fcntl.h @@ -28,8 +28,6 @@ #define F_SETOWN 12 /* for sockets. */ #define F_SETSIG 13 /* for sockets. */ #define F_GETSIG 14 /* for sockets. */ -#define F_GETOWN_EX 15 -#define F_SETOWN_EX 16 /* for posix fcntl() and lockf() */ #define F_RDLCK 01 diff --git a/include/asm-generic/fcntl.h b/include/asm-generic/fcntl.h index cd2d789..c6f3926 100644 --- a/include/asm-generic/fcntl.h +++ b/include/asm-generic/fcntl.h @@ -82,10 +82,8 @@ #endif #endif -#ifndef F_SETOWN_EX #define F_SETOWN_EX 15 #define F_GETOWN_EX 16 -#endif #define F_OWNER_TID 0 #define F_OWNER_PID 1 -- 1.6.5.2 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/