diff options
| author | davidxu <davidxu@FreeBSD.org> | 2006-12-23 03:30:50 +0000 |
|---|---|---|
| committer | davidxu <davidxu@FreeBSD.org> | 2006-12-23 03:30:50 +0000 |
| commit | ed23d7715b7d81cb397a39d274636843948a7717 (patch) | |
| tree | f8efe3e29ce27be58b2414c160ea074c7c80976d | |
| parent | a1911a8513c5b0397102355354722b76a19408fa (diff) | |
| download | FreeBSD-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@.
| -rw-r--r-- | sys/amd64/amd64/exception.S | 1 |
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 |
