Commit 6e7765cb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'asm-generic-fixes-5.19-2' of... 

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
parents 9d8a8616 e2a619ca

include/asm-generic/io.h

+0 −2
Original line number Diff line number Diff line
@@ -1125,9 +1125,7 @@ static inline void memcpy_toio(volatile void __iomem *addr, const void *buffer, 
}

#endif



#ifndef CONFIG_GENERIC_DEVMEM_IS_ALLOWED

extern int devmem_is_allowed(unsigned long pfn);

#endif



#endif /* __KERNEL__ */

include/uapi/asm-generic/fcntl.h

+2 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ struct f_owner_ex { 


#define F_LINUX_SPECIFIC_BASE	1024



#ifndef HAVE_ARCH_STRUCT_FLOCK

struct flock {

	short	l_type;

	short	l_whence;
@@ -216,5 +217,6 @@ struct flock64 { 
	__ARCH_FLOCK64_PAD

#endif

};

#endif /* HAVE_ARCH_STRUCT_FLOCK */



#endif /* _ASM_GENERIC_FCNTL_H */

tools/include/uapi/asm-generic/fcntl.h

+10 −1
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

#ifndef _ASM_GENERIC_FCNTL_H

#define _ASM_GENERIC_FCNTL_H
@@ -115,11 +116,13 @@ 
#define F_GETSIG	11	/* for sockets. */

#endif



#if __BITS_PER_LONG == 32 || defined(__KERNEL__)

#ifndef F_GETLK64

#define F_GETLK64	12	/*  using 'struct flock64' */

#define F_SETLK64	13

#define F_SETLKW64	14

#endif

#endif /* __BITS_PER_LONG == 32 || defined(__KERNEL__) */



#ifndef F_SETOWN_EX

#define F_SETOWN_EX	15
@@ -178,6 +181,10 @@ struct f_owner_ex { 
				   blocking */

#define LOCK_UN		8	/* remove lock */



/*

 * LOCK_MAND support has been removed from the kernel. We leave the symbols

 * here to not break legacy builds, but these should not be used in new code.

 */

#define LOCK_MAND	32	/* This is a mandatory flock ... */

#define LOCK_READ	64	/* which allows concurrent read operations */

#define LOCK_WRITE	128	/* which allows concurrent write operations */
@@ -185,6 +192,7 @@ struct f_owner_ex { 


#define F_LINUX_SPECIFIC_BASE	1024



#ifndef HAVE_ARCH_STRUCT_FLOCK

struct flock {

	short	l_type;

	short	l_whence;
@@ -209,5 +217,6 @@ struct flock64 { 
	__ARCH_FLOCK64_PAD

#endif

};

#endif /* HAVE_ARCH_STRUCT_FLOCK */



#endif /* _ASM_GENERIC_FCNTL_H */