PERFORCE change 29463 for review

[Peter Wemm]

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

Change 29463 by peter at peter_overcee on 2003/04/22 15:14:06

	update for the loss of struct aligned_tss;

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#70 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/machdep.c#70 (text+ko) ====

@@ -553,7 +553,7 @@
 
 static char dblfault_stack[PAGE_SIZE] __aligned(16);
 
-struct aligned_tss common_tss;
+struct x86_64tss common_tss;
 
 /* software prototypes -- in more palatable form */
 struct soft_segment_descriptor gdt_segs[] = {
@@ -1158,7 +1158,7 @@
 	/*
 	 * make gdt memory segments
 	 */
-	gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&common_tss.tss;
+	gdt_segs[GPROC0_SEL].ssd_base = (uintptr_t)&common_tss;
 
 	for (x = 0; x < NGDT; x++) {
 		if (x != GPROC0_SEL && x != (GPROC0_SEL + 1))
@@ -1238,12 +1238,12 @@
 	initializecpu();	/* Initialize CPU registers */
 
 	/* make an initial tss so cpu can get interrupt stack on syscall! */
-	common_tss.tss.tss_rsp0 = thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb);
+	common_tss.tss_rsp0 = thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb);
 	/* XXX we need to update tss_rsp0 in cpu_switch */
 	/* XXX maybe not yet, everything is still running in supervisor mode */
 
 	/* doublefault stack space, runs on ist1 */
-	common_tss.tss.tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)];
+	common_tss.tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)];
 
 	gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
 	ltr(gsel_tss);