Commit:     a32525449b30dfbae804f6b05cde041f35f5a811
Parent:     41806ef4bfacbe5c4e520d8da2fcedcda335c922
Author:     Benjamin Herrenschmidt <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 15 18:29:32 2007 +1100
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Fri Feb 16 14:00:20 2007 +1100

    [POWERPC] Fix bug with early ioremap and 64k pages
    The code for bolting hash entries for ioremap done before proper
    mm initialization has a grown a bug when using 64K pages on a
    machine where non-cacheable mappings are demoted to 4K HW pages.
    The wrong page size index is being passed to the hash table mapping
    functions causing a crash at boot on some pSeries machines using
    bare metal linux.  This fixes it.
    Signed-off-by: Benjamin Herrenschmidt <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
 arch/powerpc/mm/pgtable_64.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c
index 16e4ee1..1d44340 100644
--- a/arch/powerpc/mm/pgtable_64.c
+++ b/arch/powerpc/mm/pgtable_64.c
@@ -103,7 +103,7 @@ static int map_io_page(unsigned long ea, unsigned long pa, 
int flags)
                if (htab_bolt_mapping(ea, ea + PAGE_SIZE, pa, flags,
-                                     mmu_virtual_psize)) {
+                                     mmu_io_psize)) {
                        printk(KERN_ERR "Failed to do bolted mapping IO "
                               "memory at %016lx !\n", pa);
                        return -ENOMEM;
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