diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:09:09 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-09-04 11:09:09 -0400 |
| commit | 0ccd8c39bc664bf5e9fcc26caad50cc17ff866d1 (patch) | |
| tree | 29cec0edf3acf18c6978b750a8d6560f445df6df /include/asm-x86 | |
| parent | 1625324d22409e32e3f8eb86018cad72e1c09d61 (diff) | |
| parent | ec0c15afb41fd9ad45b53468b60db50170e22346 (diff) | |
Merge branch 'linus' into x86/core
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/kvm_host.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-x86/kvm_host.h b/include/asm-x86/kvm_host.h index 72e9a525f91a..69794547f514 100644 --- a/include/asm-x86/kvm_host.h +++ b/include/asm-x86/kvm_host.h | |||
| @@ -722,7 +722,7 @@ asmlinkage void kvm_handle_fault_on_reboot(void); | |||
| 722 | 722 | ||
| 723 | #define __kvm_handle_fault_on_reboot(insn) \ | 723 | #define __kvm_handle_fault_on_reboot(insn) \ |
| 724 | "666: " insn "\n\t" \ | 724 | "666: " insn "\n\t" \ |
| 725 | ".pushsection .text.fixup, \"ax\" \n" \ | 725 | ".pushsection .fixup, \"ax\" \n" \ |
| 726 | "667: \n\t" \ | 726 | "667: \n\t" \ |
| 727 | KVM_EX_PUSH " $666b \n\t" \ | 727 | KVM_EX_PUSH " $666b \n\t" \ |
| 728 | "jmp kvm_handle_fault_on_reboot \n\t" \ | 728 | "jmp kvm_handle_fault_on_reboot \n\t" \ |