[POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error (e3d67b66) · Commits · 戴 / test

There are no actual implementations of fixup_bigphys_addr() in arch/powerpc, and with a 64-bit aware ioremap() and so forth, it should no longer be necessary. This patch removes the last dregs of fixup_bigphys_addr() from arch/powerpc. In fact, the only reason this hasn't caused link errors already is that nobody must have tried using one of the small number of drivers using io_remap_pfn_range() on one of the small number of platforms which are 32-bit but define CONFIG_PHYS_64BIT. Nonetheless this fixes a bug, and should go into 2.6.22. Signed-off-by:

David Gibson <david@gibson.dropbear.id.au> Signed-off-by:

Paul Mackerras <paulus@samba.org>

include/asm-powerpc/mmu-44x.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -55,8 +55,6 @@

		typedef unsigned long long phys_addr_t;

		extern phys_addr_t fixup_bigphys_addr(phys_addr_t, phys_addr_t);

		typedef struct {
		unsigned long id;
		unsigned long vdso_base;

include/asm-powerpc/pgtable-ppc32.h

+0 −15

Original line number	Diff line number	Diff line
		@@ -782,23 +782,8 @@ extern void kernel_set_cachemode (unsigned long address, unsigned long size,
		/* Needs to be defined here and not in linux/mm.h, as it is arch dependent */
		#define kern_addr_valid(addr) (1)

		#ifdef CONFIG_PHYS_64BIT
		extern int remap_pfn_range(struct vm_area_struct *vma, unsigned long from,
		unsigned long paddr, unsigned long size, pgprot_t prot);

		static inline int io_remap_pfn_range(struct vm_area_struct *vma,
		unsigned long vaddr,
		unsigned long pfn,
		unsigned long size,
		pgprot_t prot)
		{
		phys_addr_t paddr64 = fixup_bigphys_addr(pfn << PAGE_SHIFT, size);
		return remap_pfn_range(vma, vaddr, paddr64 >> PAGE_SHIFT, size, prot);
		}
		#else
		#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \
		remap_pfn_range(vma, vaddr, pfn, size, prot)
		#endif

		/*
		* No page table caches to initialise

Admin message