From owner-p4-projects@FreeBSD.ORG  Thu Apr 10 14:07:57 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 93EF637B404; Thu, 10 Apr 2003 14:07:56 -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 2DE2937B401
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 14:07:56 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CD3CA43F85
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 14:07:55 -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 h3AL7t0U021802
	for <perforce@freebsd.org>; Thu, 10 Apr 2003 14:07:55 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3AL7ttG021799
	for perforce@freebsd.org; Thu, 10 Apr 2003 14:07:55 -0700 (PDT)
Date: Thu, 10 Apr 2003 14:07:55 -0700 (PDT)
Message-Id: <200304102107.h3AL7ttG021799@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 28738 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: Thu, 10 Apr 2003 21:07:57 -0000

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

Change 28738 by peter@peter_daintree on 2003/04/10 14:07:23

	Update for aligned_tss changes. (moved declaration back to tss.h so
	that genassym and swtch.s can see it).
	Dont truncate any %cr0 upper bits in cpu_setregs() (not that any
	exist)

Affected files ...

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

Differences ...

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

@@ -507,7 +507,7 @@
 void
 cpu_setregs(void)
 {
-	unsigned int cr0;
+	register_t cr0;
 
 	cr0 = rcr0();
 	cr0 |= CR0_NE;			/* Done by npxinit() */
@@ -553,15 +553,7 @@
 
 static char dblfault_stack[PAGE_SIZE];
 
-/*
- * Nasty hack to arrange internal longword alignment.
- * What were they thinking??
- */
-static struct {
-	u_int32_t pad;
-	struct x86_64tss tss  __packed;
-} common_tss;
-
+struct aligned_tss common_tss;
 
 /* software prototypes -- in more palatable form */
 struct soft_segment_descriptor gdt_segs[] = {