PERFORCE change 128790 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=128790

Change 128790 by peter at 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 */