diff options
Diffstat (limited to 'include/asm-sparc')
-rw-r--r-- | include/asm-sparc/fcntl.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h index 61334bff18c4..634557374e95 100644 --- a/include/asm-sparc/fcntl.h +++ b/include/asm-sparc/fcntl.h | |||
@@ -32,15 +32,6 @@ | |||
32 | #define F_WRLCK 2 | 32 | #define F_WRLCK 2 |
33 | #define F_UNLCK 3 | 33 | #define F_UNLCK 3 |
34 | 34 | ||
35 | struct flock { | ||
36 | short l_type; | ||
37 | short l_whence; | ||
38 | off_t l_start; | ||
39 | off_t l_len; | ||
40 | pid_t l_pid; | ||
41 | short __unused; | ||
42 | }; | ||
43 | |||
44 | struct flock64 { | 35 | struct flock64 { |
45 | short l_type; | 36 | short l_type; |
46 | short l_whence; | 37 | short l_whence; |
@@ -50,6 +41,8 @@ struct flock64 { | |||
50 | short __unused; | 41 | short __unused; |
51 | }; | 42 | }; |
52 | 43 | ||
44 | #define __ARCH_FLOCK_PAD short __unused; | ||
45 | |||
53 | #include <asm-generic/fcntl.h> | 46 | #include <asm-generic/fcntl.h> |
54 | 47 | ||
55 | #endif | 48 | #endif |