projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
[firefly-linux-kernel-4.4.55.git]
/
arch
/
ia64
/
kvm
/
kvm_minstate.h
diff --git
a/arch/ia64/kvm/kvm_minstate.h
b/arch/ia64/kvm/kvm_minstate.h
index 2cc41d17cf991855d31460c1025137589e037461..b2bcaa2787aad228a9c24e99dca6bd35fda2422e 100644
(file)
--- a/
arch/ia64/kvm/kvm_minstate.h
+++ b/
arch/ia64/kvm/kvm_minstate.h
@@
-24,6
+24,8
@@
#include <asm/asmmacro.h>
#include <asm/types.h>
#include <asm/kregs.h>
#include <asm/asmmacro.h>
#include <asm/types.h>
#include <asm/kregs.h>
+#include <asm/kvm_host.h>
+
#include "asm-offsets.h"
#define KVM_MINSTATE_START_SAVE_MIN \
#include "asm-offsets.h"
#define KVM_MINSTATE_START_SAVE_MIN \
@@
-33,7
+35,7
@@
addl r22 = VMM_RBS_OFFSET,r1; /* compute base of RBS */ \
;; \
lfetch.fault.excl.nt1 [r22]; \
addl r22 = VMM_RBS_OFFSET,r1; /* compute base of RBS */ \
;; \
lfetch.fault.excl.nt1 [r22]; \
- addl r1 =
IA64_STK_OFFSET-VMM_PT_REGS_SIZE,r1; /* compute base of memory stack */
\
+ addl r1 =
KVM_STK_OFFSET-VMM_PT_REGS_SIZE, r1;
\
mov r23 = ar.bspstore; /* save ar.bspstore */ \
;; \
mov ar.bspstore = r22; /* switch to kernel RBS */\
mov r23 = ar.bspstore; /* save ar.bspstore */ \
;; \
mov ar.bspstore = r22; /* switch to kernel RBS */\