[Midnightbsd-cvs] src [10176] sync

[laffer1 at midnightbsd.org]

Revision: 10176
          http://svnweb.midnightbsd.org/src/?rev=10176
Author:   laffer1
Date:     2018-06-01 18:59:34 -0400 (Fri, 01 Jun 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/sys/amd64/acpica/acpi_machdep.c
    trunk/sys/amd64/acpica/acpi_switch.S
    trunk/sys/amd64/acpica/acpi_wakecode.S
    trunk/sys/amd64/acpica/acpi_wakeup.c

Property Changed:
----------------
    trunk/sys/amd64/acpica/acpi_switch.S
    trunk/sys/amd64/acpica/acpi_wakecode.S

Modified: trunk/sys/amd64/acpica/acpi_machdep.c
===================================================================
--- trunk/sys/amd64/acpica/acpi_machdep.c	2018-06-01 22:59:06 UTC (rev 10175)
+++ trunk/sys/amd64/acpica/acpi_machdep.c	2018-06-01 22:59:34 UTC (rev 10176)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001 Mitsuru IWASAKI
  * All rights reserved.
@@ -25,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: release/9.2.0/sys/amd64/acpica/acpi_machdep.c 237822 2012-06-29 21:24:56Z jhb $");
+__FBSDID("$FreeBSD: stable/10/sys/amd64/acpica/acpi_machdep.c 246855 2013-02-15 22:43:08Z jkim $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -122,7 +123,7 @@
 	void *data;
 
 	off = pa & PAGE_MASK;
-	length = roundup(length + off, PAGE_SIZE);
+	length = round_page(length + off);
 	pa = pa & PG_FRAME;
 	va = (vm_offset_t)pmap_kenter_temporary(pa, offset) +
 	    (offset * PAGE_SIZE);
@@ -146,7 +147,7 @@
 
 	va = (vm_offset_t)data;
 	off = va & PAGE_MASK;
-	length = roundup(length + off, PAGE_SIZE);
+	length = round_page(length + off);
 	va &= ~PAGE_MASK;
 	while (length > 0) {
 		pmap_kremove(va);

Modified: trunk/sys/amd64/acpica/acpi_switch.S
===================================================================
--- trunk/sys/amd64/acpica/acpi_switch.S	2018-06-01 22:59:06 UTC (rev 10175)
+++ trunk/sys/amd64/acpica/acpi_switch.S	2018-06-01 22:59:34 UTC (rev 10176)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata at jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki at jp.freebsd.org>


Property changes on: trunk/sys/amd64/acpica/acpi_switch.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/amd64/acpica/acpi_wakecode.S
===================================================================
--- trunk/sys/amd64/acpica/acpi_wakecode.S	2018-06-01 22:59:06 UTC (rev 10175)
+++ trunk/sys/amd64/acpica/acpi_wakecode.S	2018-06-01 22:59:34 UTC (rev 10176)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata at jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki at jp.freebsd.org>
@@ -26,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: release/9.2.0/sys/amd64/acpica/acpi_wakecode.S 232081 2012-02-23 22:00:31Z jkim $
+ * $FreeBSD: stable/10/sys/amd64/acpica/acpi_wakecode.S 237037 2012-06-13 22:53:56Z jkim $
  */
 
 #include <machine/asmacros.h>
@@ -219,10 +220,14 @@
 	mov	$bootdata64 - bootgdt, %eax
 	mov	%ax, %ds
 
-	/* Restore arguments and return. */
-	movq	wakeup_kpml4 - wakeup_start(%rbx), %rdi
-	movq	wakeup_ctx - wakeup_start(%rbx), %rsi
-	movq	wakeup_retaddr - wakeup_start(%rbx), %rax
+	/* Restore arguments. */
+	movq	wakeup_pcb - wakeup_start(%rbx), %rdi
+	movq	wakeup_ret - wakeup_start(%rbx), %rax
+
+	/* Restore GDT. */
+	lgdt	wakeup_gdt - wakeup_start(%rbx)
+
+	/* Jump to return address. */
 	jmp	*%rax
 
 	.data
@@ -268,34 +273,11 @@
 	.long	bootgdt - wakeup_start	/* Offset plus %ds << 4 */
 
 	ALIGN_DATA
-wakeup_retaddr:
-	.quad	0
-wakeup_kpml4:
-	.quad	0
-
-wakeup_ctx:
-	.quad	0
 wakeup_pcb:
 	.quad	0
-wakeup_fpusave:
+wakeup_ret:
 	.quad	0
 wakeup_gdt:
 	.word	0
 	.quad	0
-
-	ALIGN_DATA
-wakeup_efer:
-	.quad	0
-wakeup_star:
-	.quad	0
-wakeup_lstar:
-	.quad	0
-wakeup_cstar:
-	.quad	0
-wakeup_sfmask:
-	.quad	0
-wakeup_xsmask:
-	.quad	0
-wakeup_cpu:
-	.long	0
 dummy:


Property changes on: trunk/sys/amd64/acpica/acpi_wakecode.S
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/amd64/acpica/acpi_wakeup.c
===================================================================
--- trunk/sys/amd64/acpica/acpi_wakeup.c	2018-06-01 22:59:06 UTC (rev 10175)
+++ trunk/sys/amd64/acpica/acpi_wakeup.c	2018-06-01 22:59:34 UTC (rev 10176)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2001 Takanori Watanabe <takawata at jp.freebsd.org>
  * Copyright (c) 2001 Mitsuru IWASAKI <iwasaki at jp.freebsd.org>