From owner-p4-projects@FreeBSD.ORG Wed Nov 7 20:39:19 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CBDBA16A468; Wed, 7 Nov 2007 20:39:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 6D5FB16A419
for <perforce@freebsd.org>; Wed, 7 Nov 2007 20:39:19 +0000 (UTC)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 5F57613C481
for <perforce@freebsd.org>; Wed, 7 Nov 2007 20:39:19 +0000 (UTC)
(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id lA7KdJhq034472
for <perforce@freebsd.org>; Wed, 7 Nov 2007 20:39:19 GMT
(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id lA7KdJ7T034469
for perforce@freebsd.org; Wed, 7 Nov 2007 20:39:19 GMT
(envelope-from peter@freebsd.org)
Date: Wed, 7 Nov 2007 20:39:19 GMT
Message-Id: <200711072039.lA7KdJ7T034469@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 128790 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 07 Nov 2007 20:39:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=128790
Change 128790 by peter@peter_work on 2007/11/07 20:39:09
Fix compile breakages.
Affected files ...
.. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#68 edit
Differences ...
==== //depot/projects/hammer/sys/i386/i386/mp_machdep.c#68 (text+ko) ====
@@ -513,7 +513,7 @@
pc->pc_curthread = 0;
gdt_segs[GPRIV_SEL].ssd_base = (int) &pc;
- gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pcpu.pc_common_tss;
+ gdt_segs[GPROC0_SEL].ssd_base = (int) &pc->pc_common_tss;
for (x = 0; x < NGDT; x++) {
ssdtosd(&gdt_segs[x], &gdt[myid * NGDT + x].sd);
@@ -596,7 +596,6 @@
printf("SMP: cpuid = %d\n", PCPU_GET(cpuid));
printf("SMP: actual apic_id = %d\n", lapic_id());
printf("SMP: correct apic_id = %d\n", PCPU_GET(apic_id));
- printf("PTD[MPPTDI] = %#jx\n", (uintmax_t)PTD[MPPTDI]);
panic("cpuid mismatch! boom!!");
}
@@ -736,7 +735,6 @@
#ifndef PC98
u_char mpbiosreason;
#endif
- struct pcpu *pc;
uintptr_t kptbase;
u_int32_t mpbioswarmvec;
int apic_id, cpu, i;
@@ -776,7 +774,7 @@
outb(CMOS_DATA, BIOS_WARM); /* 'warm-start' */
#endif
- bootSTK = char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 4;
+ bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 4;
bootAP = cpu;
/* attempt to start the Application Processor */