Commit:     e3d67b663b5ededac1b2c552b4f0b4fbe94d7ac3
Parent:     39d207036c76ff16650772b83fb1a12ab788ca26
Author:     David Gibson <[EMAIL PROTECTED]>
AuthorDate: Mon May 14 11:43:20 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu May 17 21:11:13 2007 +1000

    [POWERPC] Remove fixup_bigphys_addr() for arch/powerpc to avoid link error
    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 <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 include/asm-powerpc/mmu-44x.h       |    2 --
 include/asm-powerpc/pgtable-ppc32.h |   15 ---------------
 2 files changed, 0 insertions(+), 17 deletions(-)

diff --git a/include/asm-powerpc/mmu-44x.h b/include/asm-powerpc/mmu-44x.h
index d5ce7a8..62772ae 100644
--- a/include/asm-powerpc/mmu-44x.h
+++ b/include/asm-powerpc/mmu-44x.h
@@ -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;
diff --git a/include/asm-powerpc/pgtable-ppc32.h 
index 09662a2..c863bdb 100644
--- a/include/asm-powerpc/pgtable-ppc32.h
+++ b/include/asm-powerpc/pgtable-ppc32.h
@@ -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)
-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);
 #define io_remap_pfn_range(vma, vaddr, pfn, size, prot)                \
                remap_pfn_range(vma, vaddr, pfn, size, prot)
  * No page table caches to initialise
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to