From owner-p4-projects@FreeBSD.ORG  Tue Apr 22 15:14:40 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74D5F37B404; Tue, 22 Apr 2003 15:14:39 -0700 (PDT)
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 1260937B401
	for <perforce@freebsd.org>; Tue, 22 Apr 2003 15:14:39 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id AE1CC43FBD
	for <perforce@freebsd.org>; Tue, 22 Apr 2003 15:14:38 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h3MMEc0U040463
	for <perforce@freebsd.org>; Tue, 22 Apr 2003 15:14:38 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3MMEc9d040454
	for perforce@freebsd.org; Tue, 22 Apr 2003 15:14:38 -0700 (PDT)
Date: Tue, 22 Apr 2003 15:14:38 -0700 (PDT)
Message-Id: <200304222214.h3MMEc9d040454@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>
Subject: PERFORCE change 29463 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Tue, 22 Apr 2003 22:14:40 -0000

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

Change 29463 by peter@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);