From 19ae224219e30ecbfab0a893dc4db1d68578badb Mon Sep 17 00:00:00 2001 From: "Keith M. Wesolowski" Date: Sun, 21 Dec 2003 07:40:47 -0800 Subject: [PATCH] [sparc] Fix display errors on HIGHMEM and Zilog addresses. --- arch/sparc/mm/init.c | 3 ++- drivers/serial/sunzilog.c | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index 320882925ca86..47c13fc9872c9 100644 --- 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 ce575e2cf08aa..4813c4328e64b 100644 --- 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; -- 2.53.0