tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'asm-generic-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic
Pull asm-generic fixes from Arnd Bergmann:
"Two more bug fixes for asm-generic, one addressing an incorrect
Kconfig symbol reference and another one fixing a build failure for
the perf tool on mips and possibly others"
* tag 'asm-generic-fixes-5.19-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
asm-generic: remove a broken and needless ifdef conditional
tools: Fixed MIPS builds due to struct flock re-definition
+12
-3
-2
include/asm-generic/io.h
-2
include/asm-generic/io.h
+2
include/uapi/asm-generic/fcntl.h
+2
include/uapi/asm-generic/fcntl.h
···
192
192
193
193
#define F_LINUX_SPECIFIC_BASE 1024
194
194
195
+
#ifndef HAVE_ARCH_STRUCT_FLOCK
195
196
struct flock {
196
197
short l_type;
197
198
short l_whence;
···
217
216
__ARCH_FLOCK64_PAD
218
217
#endif
219
218
};
219
+
#endif /* HAVE_ARCH_STRUCT_FLOCK */
220
220
221
221
#endif /* _ASM_GENERIC_FCNTL_H */
+10
-1
tools/include/uapi/asm-generic/fcntl.h
+10
-1
tools/include/uapi/asm-generic/fcntl.h
···
1
+
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
1
2
#ifndef _ASM_GENERIC_FCNTL_H
2
3
#define _ASM_GENERIC_FCNTL_H
3
4
···
91
90
92
91
/* a horrid kludge trying to make sure that this will fail on old kernels */
93
92
#define O_TMPFILE (__O_TMPFILE | O_DIRECTORY)
94
-
#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
93
+
#define O_TMPFILE_MASK (__O_TMPFILE | O_DIRECTORY | O_CREAT)
95
94
96
95
#ifndef O_NDELAY
97
96
#define O_NDELAY O_NONBLOCK
···
116
115
#define F_GETSIG 11 /* for sockets. */
117
116
#endif
118
117
118
+
#if __BITS_PER_LONG == 32 || defined(__KERNEL__)
119
119
#ifndef F_GETLK64
120
120
#define F_GETLK64 12 /* using 'struct flock64' */
121
121
#define F_SETLK64 13
122
122
#define F_SETLKW64 14
123
123
#endif
124
+
#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */
124
125
125
126
#ifndef F_SETOWN_EX
126
127
#define F_SETOWN_EX 15
···
181
178
blocking */
182
179
#define LOCK_UN 8 /* remove lock */
183
180
181
+
/*
182
+
* LOCK_MAND support has been removed from the kernel. We leave the symbols
183
+
* here to not break legacy builds, but these should not be used in new code.
184
+
*/
184
185
#define LOCK_MAND 32 /* This is a mandatory flock ... */
185
186
#define LOCK_READ 64 /* which allows concurrent read operations */
186
187
#define LOCK_WRITE 128 /* which allows concurrent write operations */
···
192
185
193
186
#define F_LINUX_SPECIFIC_BASE 1024
194
187
188
+
#ifndef HAVE_ARCH_STRUCT_FLOCK
195
189
struct flock {
196
190
short l_type;
197
191
short l_whence;
···
217
209
__ARCH_FLOCK64_PAD
218
210
#endif
219
211
};
212
+
#endif /* HAVE_ARCH_STRUCT_FLOCK */
220
213
221
214
#endif /* _ASM_GENERIC_FCNTL_H */