diff options
| author | David Xu <davidxu@FreeBSD.org> | 2006-12-23 03:30:50 +0000 |
|---|---|---|
| committer | David Xu <davidxu@FreeBSD.org> | 2006-12-23 03:30:50 +0000 |
| commit | 4b0f4e9d9e57d68304f64608cc4a2e42aacdebab (patch) | |
| tree | f8efe3e29ce27be58b2414c160ea074c7c80976d /sys/amd64/amd64/exception.S | |
| parent | afae63880977598c1652c615141e05e77069ff32 (diff) | |
| download | src-4b0f4e9d9e57d68304f64608cc4a2e42aacdebab.tar.gz src-4b0f4e9d9e57d68304f64608cc4a2e42aacdebab.zip | |
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@.
Notes
Notes:
svn path=/head/; revision=165479
Diffstat (limited to 'sys/amd64/amd64/exception.S')
| -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 773239f318d3..20e8c3df7cff 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 |