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 'kvm-updates/2.6.37' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
exceptions-64s.S
diff --git
a/arch/powerpc/kernel/exceptions-64s.S
b/arch/powerpc/kernel/exceptions-64s.S
index
39b0c48
..
9f8b01d
100644
(file)
--- a/
arch/powerpc/kernel/exceptions-64s.S
+++ b/
arch/powerpc/kernel/exceptions-64s.S
@@
-299,6
+299,12
@@
slb_miss_user_pseries:
b . /* prevent spec. execution */
#endif /* __DISABLED__ */
b . /* prevent spec. execution */
#endif /* __DISABLED__ */
+/* KVM's trampoline code needs to be close to the interrupt handlers */
+
+#ifdef CONFIG_KVM_BOOK3S_64_HANDLER
+#include "../kvm/book3s_rmhandlers.S"
+#endif
+
.align 7
.globl __end_interrupts
__end_interrupts:
.align 7
.globl __end_interrupts
__end_interrupts: