From owner-p4-projects@FreeBSD.ORG Sun Nov 16 16:13:05 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 034AB16A4D0; Sun, 16 Nov 2003 16:13:05 -0800 (PST) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0A4916A4CE for ; Sun, 16 Nov 2003 16:13:04 -0800 (PST) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2587643FBD for ; Sun, 16 Nov 2003 16:13:04 -0800 (PST) (envelope-from peter@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hAH0D3XJ032486 for ; Sun, 16 Nov 2003 16:13:03 -0800 (PST) (envelope-from peter@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hAH0D3Ys032483 for perforce@freebsd.org; Sun, 16 Nov 2003 16:13:03 -0800 (PST) (envelope-from peter@freebsd.org) Date: Sun, 16 Nov 2003 16:13:03 -0800 (PST) Message-Id: <200311170013.hAH0D3Ys032483@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter@freebsd.org using -f From: Peter Wemm To: Perforce Change Reviews Subject: PERFORCE change 42597 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Nov 2003 00:13:05 -0000 X-List-Received-Date: Mon, 17 Nov 2003 00:13:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=42597 Change 42597 by peter@peter_overcee on 2003/11/16 16:12:44 cosmetic diff reduction Affected files ... .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#38 edit .. //depot/projects/hammer/sys/amd64/isa/atpic.c#26 edit Differences ... ==== //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#38 (text+ko) ==== @@ -369,9 +369,10 @@ /* Disable local apic just to be sure. */ lapic_disable(); + /* signal our startup to the BSP. */ mp_naps++; - /* spin until all the AP's are ready */ + /* Spin until the BSP releases the AP's. */ while (!aps_ready) ia32_pause(); @@ -493,8 +494,8 @@ /* Locate the page tables, they'll be below the trampoline */ pt4 = (u_int64_t *)(uintptr_t)(mptramp_pagetables + KERNBASE); - pt3 = pt4 + 512; - pt2 = pt3 + 512; + pt3 = pt4 + (PAGE_SIZE) / sizeof(u_int64_t); + pt2 = pt3 + (PAGE_SIZE) / sizeof(u_int64_t); /* Create the initial 1GB replicated page tables */ for (i = 0; i < 512; i++) { @@ -503,7 +504,7 @@ pt4[i] |= PG_V | PG_RW | PG_U; /* Each slot of the level 3 pages points to the same level 2 page */ - pt3[i] = (u_int64_t)(uintptr_t)(mptramp_pagetables + 2 * PAGE_SIZE); + pt3[i] = (u_int64_t)(uintptr_t)(mptramp_pagetables + (2 * PAGE_SIZE)); pt3[i] |= PG_V | PG_RW | PG_U; /* The level 2 page slots are mapped with 2MB pages for 1GB. */ ==== //depot/projects/hammer/sys/amd64/isa/atpic.c#26 (text+ko) ==== @@ -72,7 +72,6 @@ #define SLAVE_MODE ICW4_8086 #endif - static void atpic_init(void *dummy); unsigned int imen; /* XXX */