Merge tag 'please-pull-fixefi' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux (928b3f12) · Commits · 戴 / test

arch/ia64/include/asm/early_ioremap.h

0 → 100644

+10 −0

Original line number	Original line	Diff line number	Diff line
			#ifndef _ASM_IA64_EARLY_IOREMAP_H
			#define _ASM_IA64_EARLY_IOREMAP_H

			extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
			#define early_memremap(phys_addr, size) early_ioremap(phys_addr, size)

			extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
			#define early_memunmap(addr, size) early_iounmap(addr, size)

			#endif

+1 −4

Original line number	Original line	Diff line number	Diff line
	@@ -20,6 +20,7 @@
	*/		*/

	#include <asm/unaligned.h>		#include <asm/unaligned.h>
			#include <asm/early_ioremap.h>

	/* We don't use IO slowdowns on the ia64, but.. */		/* We don't use IO slowdowns on the ia64, but.. */
	#define __SLOW_DOWN_IO do { } while (0)		#define __SLOW_DOWN_IO do { } while (0)
	@@ -427,10 +428,6 @@ __writeq (unsigned long val, volatile void __iomem *addr)
	extern void __iomem * ioremap(unsigned long offset, unsigned long size);		extern void __iomem * ioremap(unsigned long offset, unsigned long size);
	extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);		extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
	extern void iounmap (volatile void __iomem *addr);		extern void iounmap (volatile void __iomem *addr);
	extern void __iomem * early_ioremap (unsigned long phys_addr, unsigned long size);
	#define early_memremap(phys_addr, size) early_ioremap(phys_addr, size)
	extern void early_iounmap (volatile void __iomem *addr, unsigned long size);
	#define early_memunmap(addr, size) early_iounmap(addr, size)
	static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)		static inline void __iomem * ioremap_cache (unsigned long phys_addr, unsigned long size)
	{		{
	return ioremap(phys_addr, size);		return ioremap(phys_addr, size);

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,7 +25,7 @@
	#include <linux/io.h>		#include <linux/io.h>
	#include <linux/platform_device.h>		#include <linux/platform_device.h>

	#include <asm/efi.h>		#include <asm/early_ioremap.h>

	struct efi __read_mostly efi = {		struct efi __read_mostly efi = {
	.mps = EFI_INVALID_TABLE_ADDR,		.mps = EFI_INVALID_TABLE_ADDR,