Commit 6ba1b005 authored Jul 28, 2020 by Linus Torvalds

Merge tag 'asm-generic-fixes-5.8' of...

Merge tag 'asm-generic-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic into master

Pull asm-generic bugfix from Arnd Bergmann:
 "A single bugfix for a regression introduced through a typo in the v5.8
  merge window, leading to incorrect data returned from inl() on some
  architectures"

* tag 'asm-generic-fixes-5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
  io: Fix return type of _inb and _inl

parents fb896c91 214ba358

include/asm-generic/io.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem addr, const void buffer,

		#if !defined(inb) && !defined(_inb)
		#define _inb _inb
		static inline u16 _inb(unsigned long addr)
		static inline u8 _inb(unsigned long addr)
		{
		u8 val;

		@@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr)

		#if !defined(inl) && !defined(_inl)
		#define _inl _inl
		static inline u16 _inl(unsigned long addr)
		static inline u32 _inl(unsigned long addr)
		{
		u32 val;

Admin message