diff options
| author | peter <peter@FreeBSD.org> | 2005-06-30 05:33:26 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2005-06-30 05:33:26 +0000 |
| commit | eccb02a205008503096630eaf47698fc0ed02389 (patch) | |
| tree | 98fff5b4856fe594b52ea9e2488fd3c405adaaa0 /sys/amd64/amd64/apic_vector.S | |
| parent | b862e397733a83bf7845548cfea526d1198a0f19 (diff) | |
| download | FreeBSD-src-eccb02a205008503096630eaf47698fc0ed02389.zip FreeBSD-src-eccb02a205008503096630eaf47698fc0ed02389.tar.gz | |
Sync i386->amd64.
* Add ichwd (The Intel EM64T folks have an ICH)
* Cosmetic comment syncs
* Merge cpufreq change over to NOTES
* add pbio (it compiles, but isn't useful since no boxes have ISA slots)
* copy ath settings (note: wlan disabled here since its in global NOTES)
* copy profiling, including fixing a previous i386->amd64 merge typo.
Approved by: re (blanket i386 <-> amd64 sync/convergence)
Diffstat (limited to 'sys/amd64/amd64/apic_vector.S')
| -rw-r--r-- | sys/amd64/amd64/apic_vector.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 97335cb..5d7685b 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -148,7 +148,7 @@ IDTVEC(timerint) movq lapic, %rdx movl $0, LA_EOI(%rdx) /* End Of Interrupt to APIC */ - FAKE_MCOUNT(TF_EIP(%esp)) + FAKE_MCOUNT(TF_RIP(%rsp)) call lapic_handle_timer MEXITCOUNT |
