Reviewed-by: Guo Ren <guoren@xxxxxxxxxx> On Mon, Jan 31, 2022 at 2:49 PM Christoph Hellwig <hch@xxxxxx> wrote: > > Signed-off-by: Christoph Hellwig <hch@xxxxxx> > --- > include/uapi/asm-generic/fcntl.h | 2 -- > tools/include/uapi/asm-generic/fcntl.h | 2 -- > 2 files changed, 4 deletions(-) > > diff --git a/include/uapi/asm-generic/fcntl.h b/include/uapi/asm-generic/fcntl.h > index ecd0f5bdfc1d6..caa482e3b01af 100644 > --- a/include/uapi/asm-generic/fcntl.h > +++ b/include/uapi/asm-generic/fcntl.h > @@ -207,7 +207,6 @@ struct flock { > }; > #endif > > -#ifndef HAVE_ARCH_STRUCT_FLOCK64 > #ifndef __ARCH_FLOCK64_PAD > #define __ARCH_FLOCK64_PAD > #endif > @@ -220,6 +219,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 ac190958c9814..4a49d33ca4d55 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 */ > -- > 2.30.2 > -- Best Regards Guo Ren ML: https://lore.kernel.org/linux-csky/