sparc32: Move ioremap/iounmap declaration before asm-generic/io.h include (1d29b36a) · Commits · 戴 / test

Move the ioremap/iounmap declaration before asm-generic/io.h is included so that it is visible within it. Link: https://lore.kernel.org/r/93e2f23cda474a92a4708d4c50c9c359426a2162.1600254147.git.lorenzo.pieralisi@arm.com Signed-off-by:

"David S. Miller" <davem@davemloft.net> Cc: "David S. Miller" <davem@davemloft.net>

arch/sparc/include/asm/io_32.h

+7 −6

Original line number	Diff line number	Diff line
		@@ -11,6 +11,13 @@
		#define memcpy_fromio(d,s,sz) _memcpy_fromio(d,s,sz)
		#define memcpy_toio(d,s,sz) _memcpy_toio(d,s,sz)

		/*
		* Bus number may be embedded in the higher bits of the physical address.
		* This is why we have no bus number argument to ioremap().
		*/
		void __iomem *ioremap(phys_addr_t offset, size_t size);
		void iounmap(volatile void __iomem *addr);

		#include <asm-generic/io.h>

		static inline void _memset_io(volatile void __iomem *dst,
		@@ -121,12 +128,6 @@ static inline void sbus_memcpy_toio(volatile void __iomem *dst,
		}
		}

		/*
		* Bus number may be embedded in the higher bits of the physical address.
		* This is why we have no bus number argument to ioremap().
		*/
		void __iomem *ioremap(phys_addr_t offset, size_t size);
		void iounmap(volatile void __iomem *addr);
		/* Create a virtual mapping cookie for an IO port range */
		void __iomem *ioport_map(unsigned long port, unsigned int nr);
		void ioport_unmap(void __iomem *);