git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
kvm
/
kvm_svm.h
diff --git
a/drivers/kvm/kvm_svm.h
b/drivers/kvm/kvm_svm.h
index
7d7f2aa
..
624f1ca
100644
(file)
--- a/
drivers/kvm/kvm_svm.h
+++ b/
drivers/kvm/kvm_svm.h
@@
-1,6
+1,7
@@
#ifndef __KVM_SVM_H
#define __KVM_SVM_H
#ifndef __KVM_SVM_H
#define __KVM_SVM_H
+#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/list.h>
#include <asm/msr.h>
#include <linux/types.h>
#include <linux/list.h>
#include <asm/msr.h>
@@
-9,7
+10,7
@@
#include "kvm.h"
static const u32 host_save_msrs[] = {
#include "kvm.h"
static const u32 host_save_msrs[] = {
-#ifdef
__x86_64__
+#ifdef
CONFIG_X86_64
MSR_STAR, MSR_LSTAR, MSR_CSTAR, MSR_SYSCALL_MASK, MSR_KERNEL_GS_BASE,
MSR_FS_BASE, MSR_GS_BASE,
#endif
MSR_STAR, MSR_LSTAR, MSR_CSTAR, MSR_SYSCALL_MASK, MSR_KERNEL_GS_BASE,
MSR_FS_BASE, MSR_GS_BASE,
#endif
@@
-18,7
+19,7
@@
static const u32 host_save_msrs[] = {
MSR_IA32_LASTBRANCHTOIP, MSR_IA32_LASTINTFROMIP,MSR_IA32_LASTINTTOIP,*/
};
MSR_IA32_LASTBRANCHTOIP, MSR_IA32_LASTINTFROMIP,MSR_IA32_LASTINTTOIP,*/
};
-#define NR_HOST_SAVE_MSRS
(sizeof(host_save_msrs) / sizeof(*host_save_msrs)
)
+#define NR_HOST_SAVE_MSRS
ARRAY_SIZE(host_save_msrs
)
#define NUM_DB_REGS 4
struct vcpu_svm {
#define NUM_DB_REGS 4
struct vcpu_svm {