summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbholler <none@none>2007-06-19 21:30:01 -0700
committerbholler <none@none>2007-06-19 21:30:01 -0700
commite406c1a653efe990acda3d82ba2c489ca4bd5922 (patch)
tree6289026c374272a0298d27ea76b37329ef280c04
parentbfb244bafad217a1871c5c203fc94f71751eb28c (diff)
downloadillumos-joyent-e406c1a653efe990acda3d82ba2c489ca4bd5922.tar.gz
6571080 i86_monitor() panics when booting 32bit kernel
-rw-r--r--usr/src/uts/intel/ia32/ml/i86_subr.s10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr/src/uts/intel/ia32/ml/i86_subr.s b/usr/src/uts/intel/ia32/ml/i86_subr.s
index 5ee0675b1b..661eddfba6 100644
--- a/usr/src/uts/intel/ia32/ml/i86_subr.s
+++ b/usr/src/uts/intel/ia32/ml/i86_subr.s
@@ -691,9 +691,9 @@ i86_monitor(volatile uint32_t *addr, uint32_t extensions, uint32_t hints)
ENTRY_NP(i86_monitor)
pushl %ebp
movl %esp, %ebp
- movl 0x4(%esp),%eax /* addr */
- movl 0x8(%esp),%ecx /* extensions */
- movl 0xc(%esp),%edx /* hints */
+ movl 0x8(%ebp),%eax /* addr */
+ movl 0xc(%ebp),%ecx /* extensions */
+ movl 0x10(%ebp),%edx /* hints */
.byte 0x0f, 0x01, 0xc8 /* monitor */
leave
ret
@@ -728,8 +728,8 @@ i86_mwait(uint32_t data, uint32_t extensions)
ENTRY_NP(i86_mwait)
pushl %ebp
movl %esp, %ebp
- movl 0x4(%esp),%eax /* data */
- movl 0x8(%esp),%ecx /* extensions */
+ movl 0x8(%ebp),%eax /* data */
+ movl 0xc(%ebp),%ecx /* extensions */
.byte 0x0f, 0x01, 0xc9 /* mwait */
leave
ret