summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2003-01-02 19:05:59 -0800
committerDavid S. Miller <davem@nuts.ninka.net>2003-01-02 19:05:59 -0800
commit0c1821dbc5da39f63f6e37fb084f38515d5b0d5d (patch)
treee49cc57de71b37807ffe47afb9ecbce9ed45599f /include
parentc8e9f940049e7b389a9539626cfa952f41ae38b6 (diff)
[PATCH] compat_flock: x86_64
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86_64/compat.h8
-rw-r--r--include/asm-x86_64/ia32.h10
2 files changed, 8 insertions, 10 deletions
diff --git a/include/asm-x86_64/compat.h b/include/asm-x86_64/compat.h
index 47e4aa499cc2..adc5293b3a2b 100644
--- a/include/asm-x86_64/compat.h
+++ b/include/asm-x86_64/compat.h
@@ -54,4 +54,12 @@ struct compat_stat {
u32 __unused5;
};
+struct compat_flock {
+ short l_type;
+ short l_whence;
+ compat_off_t l_start;
+ compat_off_t l_len;
+ compat_pid_t l_pid;
+};
+
#endif /* _ASM_X86_64_COMPAT_H */
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86_64/ia32.h
index 23d4d607a398..802b85d4750f 100644
--- a/include/asm-x86_64/ia32.h
+++ b/include/asm-x86_64/ia32.h
@@ -22,16 +22,6 @@ typedef long __kernel_loff_t32;
typedef __kernel_fsid_t __kernel_fsid_t32;
-/* fcntl.h */
-struct flock32 {
- short l_type;
- short l_whence;
- compat_off_t l_start;
- compat_off_t l_len;
- compat_pid_t l_pid;
-};
-
-
struct ia32_flock64 {
short l_type;
short l_whence;