From e2990ed5656c6beab21f519aa94bcb34e0aa9c62 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 24 Dec 2003 03:30:55 -0800 Subject: [PATCH] Cset exclude: wesolows@foobazco.org|ChangeSet|20031222074047|57357 --- arch/sparc/mm/init.c | 3 +-- drivers/serial/sunzilog.c | 4 ---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/sparc/mm/init.c b/arch/sparc/mm/init.c index 47c13fc9872c9..320882925ca86 100644 --- a/arch/sparc/mm/init.c +++ b/arch/sparc/mm/init.c @@ -209,8 +209,7 @@ 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() >> (20 - PAGE_SHIFT)); + printk(KERN_NOTICE "%ldMB HIGHMEM available.\n", calc_highpages()); } #ifdef CONFIG_BLK_DEV_INITRD diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c index 4813c4328e64b..ce575e2cf08aa 100644 --- a/drivers/serial/sunzilog.c +++ b/drivers/serial/sunzilog.c @@ -1522,10 +1522,6 @@ 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