From owner-svn-src-all@FreeBSD.ORG  Thu Jul 29 16:41:21 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7F7BD106564A;
	Thu, 29 Jul 2010 16:41:21 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6EAD98FC0C;
	Thu, 29 Jul 2010 16:41:21 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o6TGfLuf095922;
	Thu, 29 Jul 2010 16:41:21 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o6TGfL6p095918;
	Thu, 29 Jul 2010 16:41:21 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201007291641.o6TGfL6p095918@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 29 Jul 2010 16:41:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r210614 - in head/sys/amd64: acpica amd64
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 Jul 2010 16:41:21 -0000

Author: jkim
Date: Thu Jul 29 16:41:21 2010
New Revision: 210614
URL: http://svn.freebsd.org/changeset/base/210614

Log:
  Rename PCB_USER_FPU to PCB_USERFPU not to clash with a macro from fpu.h.

Modified:
  head/sys/amd64/acpica/acpi_switch.S
  head/sys/amd64/amd64/cpu_switch.S
  head/sys/amd64/amd64/genassym.c

Modified: head/sys/amd64/acpica/acpi_switch.S
==============================================================================
--- head/sys/amd64/acpica/acpi_switch.S	Thu Jul 29 16:40:45 2010	(r210613)
+++ head/sys/amd64/acpica/acpi_switch.S	Thu Jul 29 16:41:21 2010	(r210614)
@@ -156,7 +156,7 @@ ENTRY(acpi_restorecpu)
 	movq	PCPU(FPCURTHREAD), %rax
 	testq	%rax, %rax
 	je	1f
-	fxrstor	WAKEUP_PCB(USER_FPU)
+	fxrstor	WAKEUP_PCB(USERFPU)
 1:
 
 	/* Restore CR0 with FPU mode. */

Modified: head/sys/amd64/amd64/cpu_switch.S
==============================================================================
--- head/sys/amd64/amd64/cpu_switch.S	Thu Jul 29 16:40:45 2010	(r210613)
+++ head/sys/amd64/amd64/cpu_switch.S	Thu Jul 29 16:41:21 2010	(r210614)
@@ -421,7 +421,7 @@ ENTRY(savectx2)
 	testq	%rax,%rax
 	je	1f
 	clts
-	fxsave	PCB_USER_FPU(%r8)
+	fxsave	PCB_USERFPU(%r8)
 1:
 
 	movl	$1, %eax

Modified: head/sys/amd64/amd64/genassym.c
==============================================================================
--- head/sys/amd64/amd64/genassym.c	Thu Jul 29 16:40:45 2010	(r210613)
+++ head/sys/amd64/amd64/genassym.c	Thu Jul 29 16:41:21 2010	(r210614)
@@ -140,7 +140,7 @@ ASSYM(PCB_DR2, offsetof(struct pcb, pcb_
 ASSYM(PCB_DR3, offsetof(struct pcb, pcb_dr3));
 ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6));
 ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
-ASSYM(PCB_USER_FPU, offsetof(struct pcb, pcb_user_save));
+ASSYM(PCB_USERFPU, offsetof(struct pcb, pcb_user_save));
 ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp));
 ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret));
 ASSYM(PCB_DBREGS, PCB_DBREGS);