From 2df1fe9ca32bb227b9158c67f5c00b54c20b10fd Mon Sep 17 00:00:00 2001
From: randyf <none@none>
Date: Sat, 20 Oct 2007 16:00:42 -0700
Subject: PSARC/2005/469 X86 Energy Star compliance PSARC/2006/632 PSMI
 extension for state save and restore 6330209 nge needs to support
 DDI_SUSPEND/DDI_RESUME 6381827 Suspend to RAM on x86 6393154 audio810 needs
 to support DDI_SUSPEND/DDI_RESUME 6397047 fd, fdc needs to support
 Suspend/Resume 6401974 cannot enter S3 with ohci PME enable set on Tyan 2865
 with Sun or Tyan 2.01 BIOS 6422613 memscrubber doesn't re-acquire lock before
 CALLB_CPR_EXIT 6455736 ata/dadk/cmdk should support DDI_SUSPEND/DDI_RESUME
 6511370 CPR on SPARC regression 6586018 TODOP Macros in i86pc/sys/machclock.h
 not in sun4u/sun4v equivilent (Sparc only) 6610124 It takes more than 3
 minutes after printing "pci_pre_resume nv_sata:0" 6617143 powerd/pmconfig
 emits a different default message for an existing on or off action.

--HG--
rename : usr/src/cmd/power/power.conf => usr/src/cmd/power/power.conf.sparc
---
 usr/src/uts/i86pc/os/mp_pc.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'usr/src/uts/i86pc/os/mp_pc.c')

diff --git a/usr/src/uts/i86pc/os/mp_pc.c b/usr/src/uts/i86pc/os/mp_pc.c
index eb07c7bd4f..7746818a8f 100644
--- a/usr/src/uts/i86pc/os/mp_pc.c
+++ b/usr/src/uts/i86pc/os/mp_pc.c
@@ -47,6 +47,9 @@
 
 extern void real_mode_start(void);
 extern void real_mode_end(void);
+extern void *(*cpu_pause_func)(void *);
+
+void rmp_gdt_init(rm_platter_t *);
 
 /*
  * Fill up the real mode platter to make it easy for real mode code to
@@ -68,8 +71,8 @@ mach_cpucontext_init(void)
 	 * setup secondary cpu bios boot up vector
 	 */
 	*vec = (ushort_t)((caddr_t)
-		((struct rm_platter *)rm_platter_va)->rm_code - rm_platter_va
-		+ ((ulong_t)rm_platter_va & 0xf));
+	    ((struct rm_platter *)rm_platter_va)->rm_code - rm_platter_va
+	    + ((ulong_t)rm_platter_va & 0xf));
 	vec[1] = (ushort_t)(rm_platter_pa >> 4);
 	warm_reset_vector = vec;
 
@@ -162,6 +165,16 @@ mach_cpucontext_alloc(struct cpu *cp)
 	rm->rm_x86feature = x86_feature;
 	rm->rm_cr4 = getcr4();
 
+	rmp_gdt_init(rm);
+
+	return (ct);
+}
+
+/*ARGSUSED*/
+void
+rmp_gdt_init(rm_platter_t *rm)
+{
+
 #if defined(__amd64)
 
 	if (getcr3() > 0xffffffffUL)
@@ -197,7 +210,6 @@ mach_cpucontext_alloc(struct cpu *cp)
 	    ((uint32_t)long_mode_64 - (uint32_t)real_mode_start);
 #endif	/* __amd64 */
 
-	return (ct);
 }
 
 /*ARGSUSED*/
-- 
cgit v1.2.3