summaryrefslogtreecommitdiffstats
path: root/sys/amd64
diff options
context:
space:
mode:
authordavidxu <davidxu@FreeBSD.org>2006-12-23 03:30:50 +0000
committerdavidxu <davidxu@FreeBSD.org>2006-12-23 03:30:50 +0000
commited23d7715b7d81cb397a39d274636843948a7717 (patch)
treef8efe3e29ce27be58b2414c160ea074c7c80976d /sys/amd64
parenta1911a8513c5b0397102355354722b76a19408fa (diff)
downloadFreeBSD-src-ed23d7715b7d81cb397a39d274636843948a7717.zip
FreeBSD-src-ed23d7715b7d81cb397a39d274636843948a7717.tar.gz
Fix a panic when rebooting a SMP machine, when option STOP_NMI is used,
nmi handler is used to stop other processors, nmi hander calls trap(), however, trap() now accepts a pointer rather than a reference, this was changed by kmacy@.
Diffstat (limited to 'sys/amd64')
-rw-r--r--sys/amd64/amd64/exception.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 773239f..20e8c3d 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -365,6 +365,7 @@ nmi_needswapgs:
/* Note: this label is also used by ddb and gdb: */
nmi_calltrap:
FAKE_MCOUNT(TF_RIP(%rsp))
+ movq %rsp, %rdi
call trap
MEXITCOUNT
testl %ebx,%ebx
OpenPOWER on IntegriCloud