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 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
kernel
/
image-vars.h
diff --git
a/arch/arm64/kernel/image-vars.h
b/arch/arm64/kernel/image-vars.h
index
fbd4b6b
..
61684a5
100644
(file)
--- a/
arch/arm64/kernel/image-vars.h
+++ b/
arch/arm64/kernel/image-vars.h
@@
-96,6
+96,8
@@
KVM_NVHE_ALIAS(vgic_v3_cpuif_trap);
/* Static key checked in pmr_sync(). */
#ifdef CONFIG_ARM64_PSEUDO_NMI
KVM_NVHE_ALIAS(gic_pmr_sync);
+/* Static key checked in GIC_PRIO_IRQOFF. */
+KVM_NVHE_ALIAS(gic_nonsecure_priorities);
#endif
/* EL2 exception handling */