[PATCH 21/31] mips/kvm: Allow set_except_vector() to be used from MIPSVZ code.
From: David Daney <hidden>
Date: 2013-06-07 23:08:10
Also in:
kvm, lkml
Subsystem:
mips, the rest · Maintainers:
Thomas Bogendoerfer, Linus Torvalds
From: David Daney <redacted> We need to move it out of __init so we don't have section mismatch problems. Signed-off-by: David Daney <redacted> --- arch/mips/include/asm/uasm.h | 2 +- arch/mips/kernel/traps.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/mips/include/asm/uasm.h b/arch/mips/include/asm/uasm.h
index 370d967..90b4f5e 100644
--- a/arch/mips/include/asm/uasm.h
+++ b/arch/mips/include/asm/uasm.h@@ -11,7 +11,7 @@ #include <linux/types.h> -#ifdef CONFIG_EXPORT_UASM +#if defined(CONFIG_EXPORT_UASM) || IS_ENABLED(CONFIG_KVM_MIPSVZ) #include <linux/export.h> #define __uasminit #define __uasminitdata
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index f008795..fca0a2f 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c@@ -1457,7 +1457,7 @@ unsigned long ebase; unsigned long exception_handlers[32]; unsigned long vi_handlers[64]; -void __init *set_except_vector(int n, void *addr) +void __uasminit *set_except_vector(int n, void *addr) { unsigned long handler = (unsigned long) addr; unsigned long old_handler;
--
1.7.11.7