Return-Path: <linux-kernel-owner+willy=40w.ods.org@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id <S262792AbTCKA6A>; Mon, 10 Mar 2003 19:58:00 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org
	id <S262795AbTCKA6A>; Mon, 10 Mar 2003 19:58:00 -0500
Received: from supreme.pcug.org.au ([203.10.76.34]:65236 "EHLO pcug.org.au")
	by vger.kernel.org with ESMTP id <S262792AbTCKA57>;
	Mon, 10 Mar 2003 19:57:59 -0500
Date: Tue, 11 Mar 2003 12:08:31 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: rth@twiddle.net
Cc: torvalds@transmeta.com, linux-kernel@vger.kernel.org
Subject: [PATCH][COMPAT] compat_sys_fcntl{,64} 9/9 Aalpha part
Message-Id: <20030311120831.311c4875.sfr@canb.auug.org.au>
In-Reply-To: <20030311114113.44abed66.sfr@canb.auug.org.au>
References: <20030311114113.44abed66.sfr@canb.auug.org.au>
X-Mailer: Sylpheed version 0.8.10 (GTK+ 1.2.10; i386-debian-linux-gnu)
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 998
Lines: 28

Hi Richard,

This is only partly to do with the other parts of this patch set.  All it
does is remove struct flock64 from the Alpha port.  Please apply after
Linus has applied the generic part of the patch.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff -ruN 2.5.64-2003030918-32bit.1/include/asm-alpha/fcntl.h 2.5.64-2003030918-32bit.2/include/asm-alpha/fcntl.h
--- 2.5.64-2003030918-32bit.1/include/asm-alpha/fcntl.h	2001-09-18 06:16:30.000000000 +1000
+++ 2.5.64-2003030918-32bit.2/include/asm-alpha/fcntl.h	2003-03-09 20:34:45.000000000 +1100
@@ -69,9 +69,6 @@
 	__kernel_pid_t l_pid;
 };
 
-#ifdef __KERNEL__
-#define flock64	flock
-#endif
 #define F_LINUX_SPECIFIC_BASE  1024
 
 #endif
-
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/