[sparc] Fix display errors on HIGHMEM and Zilog addresses.

diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c
index 320882925ca86e5ff24c1a8dc463424c73ceb792..47c13fc9872c9a442d13e62d9094f725ebec55b5 100644 (file)
--- a/arch/sparc/mm/init.c
+++ b/arch/sparc/mm/init.c
@@ -209,7 +209,8 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
        if (max_low_pfn > (SRMMU_MAXMEM >> PAGE_SHIFT)) {
                highstart_pfn = (SRMMU_MAXMEM >> PAGE_SHIFT);
                max_low_pfn = calc_max_low_pfn();
-               printk(KERN_NOTICE "%ldMB HIGHMEM available.\n", calc_highpages());
+               printk(KERN_NOTICE "%ldMB HIGHMEM available.\n",
+                      calc_highpages() >> (20 - PAGE_SHIFT));
        }
 
 #ifdef CONFIG_BLK_DEV_INITRD

diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index ce575e2cf08aa67891f396db85dfab8c81443a42..4813c4328e64b0840bf1dc04f4c77b36d388ecde 100644 (file)
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1522,6 +1522,10 @@ static void __init sunzilog_prepare(void)
                up[(chip * 2) + 0].port.membase = (char *) &rp->channelA;
                up[(chip * 2) + 1].port.membase = (char *) &rp->channelB;
 
+               /* These do nothing but make the boot output sensible */
+               up[(chip * 2) + 0].port.mapbase = (unsigned long) &rp->channelA;
+               up[(chip * 2) + 1].port.mapbase = (unsigned long) &rp->channelB;
+
                /* Channel A */
                up[(chip * 2) + 0].port.iotype = SERIAL_IO_MEM;
                up[(chip * 2) + 0].port.irq = zilog_irq;