projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64...
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kvm
/
hyp-init.S
diff --git
a/arch/arm64/kvm/hyp-init.S
b/arch/arm64/kvm/hyp-init.S
index
e76c0e8
..
86971fe
100644
(file)
--- a/
arch/arm64/kvm/hyp-init.S
+++ b/
arch/arm64/kvm/hyp-init.S
@@
-6,6
+6,7
@@
#include <linux/linkage.h>
+#include <asm/alternative.h>
#include <asm/assembler.h>
#include <asm/kvm_arm.h>
#include <asm/kvm_mmu.h>