linux-mips
[Top] [All Lists]

[PATCH 21/31] mips/kvm: Allow set_except_vector() to be used from MIPSVZ

To: linux-mips@linux-mips.org, ralf@linux-mips.org, kvm@vger.kernel.org, Sanjay Lal <sanjayl@kymasys.com>
Subject: [PATCH 21/31] mips/kvm: Allow set_except_vector() to be used from MIPSVZ code.
From: David Daney <ddaney.cavm@gmail.com>
Date: Fri, 7 Jun 2013 16:03:25 -0700
Cc: linux-kernel@vger.kernel.org, David Daney <david.daney@cavium.com>
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=aZ1XDNQoGzrg4LRkDzgrLGSCrBOVjExggtg9/Dyb+yU=; b=rvmX1dq426PGxDzTFAPjwehYMq7MvANiAHJGJsAVWXbuGVlV2zQeCs3PVRDkEEXeC0 cVS34y5YhtLDsfYeD0rq49qmPGtL/eRznTcvMZ8uiom82gH90k1m87Td96kpMOvNbhbY irK8GAnagZiGV208YU0/Pn3/dD9ZaLZ1GUojvMi/eqv5t7jEfKH6LTG/eHxl+s9YHoLZ UPK/fnfF6p9pQYljsJBsyvUlvUru+AmIIQQ9Flt36yHU2XR3c9/DI0im8wNkBMBTUurF 9QYc1RztqYqAdTPCasOt0QEcaK6Tw7/sKpsGPTjOi+xunZwYScrWrVttbqMqLXJEnqsJ tQOw==
In-reply-to: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1370646215-6543-1-git-send-email-ddaney.cavm@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: David Daney <david.daney@cavium.com>

We need to move it out of __init so we don't have section mismatch problems.

Signed-off-by: David Daney <david.daney@cavium.com>
---
 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


<Prev in Thread] Current Thread [Next in Thread>