| Message ID | 20210412085545.2595431-2-hch@lst.de (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | [1/5] uapi: remove the unused HAVE_ARCH_STRUCT_FLOCK64 define | expand |
On Mon, Apr 12, 2021 at 10:55 AM Christoph Hellwig <hch@lst.de> wrote: > > Signed-off-by: Christoph Hellwig <hch@lst.de> The patch looks good, but I'd like to see a description for each one. How about: | The check was added when Stephen Rothwell created the file, but | no architecture ever defined it. Arnd
Hi Arnd, On Mon, 12 Apr 2021 11:55:41 +0200 Arnd Bergmann <arnd@arndb.de> wrote: > > On Mon, Apr 12, 2021 at 10:55 AM Christoph Hellwig <hch@lst.de> wrote: > > > > Signed-off-by: Christoph Hellwig <hch@lst.de> > > The patch looks good, but I'd like to see a description for each one. > How about: > > | The check was added when Stephen Rothwell created the file, but > | no architecture ever defined it. Actually it was used by the xtensa architecture until Dec, 2006.
diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h index 9dc0bf0c5a6ee8..fb454bb629d114 100644 --- a/include/uapi/asm-generic/fcntl.h +++ b/include/uapi/asm-generic/fcntl.h @@ -203,7 +203,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -216,6 +215,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */ diff --git a/tools/include/uapi/asm-generic/fcntl.h b/tools/include/uapi/asm-generic/fcntl.h index ac190958c98144..4a49d33ca4d55d 100644 --- a/tools/include/uapi/asm-generic/fcntl.h +++ b/tools/include/uapi/asm-generic/fcntl.h @@ -202,7 +202,6 @@ struct flock { }; #endif -#ifndef HAVE_ARCH_STRUCT_FLOCK64 #ifndef __ARCH_FLOCK64_PAD #define __ARCH_FLOCK64_PAD #endif @@ -215,6 +214,5 @@ struct flock64 { __kernel_pid_t l_pid; __ARCH_FLOCK64_PAD }; -#endif #endif /* _ASM_GENERIC_FCNTL_H */
Signed-off-by: Christoph Hellwig <hch@lst.de> --- include/uapi/asm-generic/fcntl.h | 2 -- tools/include/uapi/asm-generic/fcntl.h | 2 -- 2 files changed, 4 deletions(-)