Merge git://oss.sgi.com:8090/oss/git/xfs-2.6

[powerpc.git] / include / asm-sparc / fcntl.h

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
index 61334bf..5db60b5 100644 (file)
--- a/include/asm-sparc/fcntl.h
+++ b/include/asm-sparc/fcntl.h
@@ -23,32 +23,13 @@
 #define F_SETLK                8
 #define F_SETLKW       9
 
-#define F_GETLK64      12      /*  using 'struct flock64' */
-#define F_SETLK64      13
-#define F_SETLKW64     14
-
 /* for posix fcntl() and lockf() */
 #define F_RDLCK                1
 #define F_WRLCK                2
 #define F_UNLCK                3
 
-struct flock {
-       short l_type;
-       short l_whence;
-       off_t l_start;
-       off_t l_len;
-       pid_t l_pid;
-       short __unused;
-};
-
-struct flock64 {
-       short l_type;
-       short l_whence;
-       loff_t l_start;
-       loff_t l_len;
-       pid_t l_pid;
-       short __unused;
-};
+#define __ARCH_FLOCK_PAD       short __unused;
+#define __ARCH_FLOCK64_PAD     short __unused;
 
 #include <asm-generic/fcntl.h>