diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/asm-x86/kvm_para.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/asm-x86/kvm_para.h')
| -rw-r--r-- | include/asm-x86/kvm_para.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/kvm_para.h b/include/asm-x86/kvm_para.h index 76f392146daa..30054fded4fb 100644 --- a/include/asm-x86/kvm_para.h +++ b/include/asm-x86/kvm_para.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef __X86_KVM_PARA_H | 1 | #ifndef ASM_X86__KVM_PARA_H |
| 2 | #define __X86_KVM_PARA_H | 2 | #define ASM_X86__KVM_PARA_H |
| 3 | 3 | ||
| 4 | /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It | 4 | /* This CPUID returns the signature 'KVMKVMKVM' in ebx, ecx, and edx. It |
| 5 | * should be used to determine that a VM is running under KVM. | 5 | * should be used to determine that a VM is running under KVM. |
| @@ -144,4 +144,4 @@ static inline unsigned int kvm_arch_para_features(void) | |||
| 144 | 144 | ||
| 145 | #endif | 145 | #endif |
| 146 | 146 | ||
| 147 | #endif | 147 | #endif /* ASM_X86__KVM_PARA_H */ |