From 6d9a48af2a4c0f7b097f8aa15ea0334d099a9ad7 Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Tue, 7 Dec 2010 17:41:40 +0000
Subject: [PATCH] --- yaml --- r: 222994 b: refs/heads/master c:
 6142e05f30b101adeafb0d12e35983f44f68233e h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/arch/mn10300/kernel/gdb-io-serial.c | 3 ++-
 trunk/arch/mn10300/kernel/gdb-io-ttysm.c  | 3 ++-
 trunk/arch/mn10300/kernel/gdb-stub.c      | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index b06e49e1172b..b7299a545848 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81e8d2162566379adcf4b3700f03845c62577145
+refs/heads/master: 6142e05f30b101adeafb0d12e35983f44f68233e
diff --git a/trunk/arch/mn10300/kernel/gdb-io-serial.c b/trunk/arch/mn10300/kernel/gdb-io-serial.c
index 0d5d63c91dc3..f28dc99c6f72 100644
--- a/trunk/arch/mn10300/kernel/gdb-io-serial.c
+++ b/trunk/arch/mn10300/kernel/gdb-io-serial.c
@@ -73,7 +73,8 @@ void gdbstub_io_init(void)
 	GDBPORT_SERIAL_IER = UART_IER_RDI | UART_IER_RLSI;
 
 	/* permit level 0 IRQs to take place */
-	local_change_intr_mask_level(NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
+	arch_local_change_intr_mask_level(
+		NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
 }
 
 /*
diff --git a/trunk/arch/mn10300/kernel/gdb-io-ttysm.c b/trunk/arch/mn10300/kernel/gdb-io-ttysm.c
index 97dfda23342c..abdeea153c89 100644
--- a/trunk/arch/mn10300/kernel/gdb-io-ttysm.c
+++ b/trunk/arch/mn10300/kernel/gdb-io-ttysm.c
@@ -87,7 +87,8 @@ void __init gdbstub_io_init(void)
 	tmp = *gdbstub_port->_control;
 
 	/* permit level 0 IRQs only */
-	local_change_intr_mask_level(NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
+	arch_local_change_intr_mask_level(
+		NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
 }
 
 /*
diff --git a/trunk/arch/mn10300/kernel/gdb-stub.c b/trunk/arch/mn10300/kernel/gdb-stub.c
index a5fc3f05309b..b169d99d9f20 100644
--- a/trunk/arch/mn10300/kernel/gdb-stub.c
+++ b/trunk/arch/mn10300/kernel/gdb-stub.c
@@ -1194,7 +1194,8 @@ static int gdbstub(struct pt_regs *regs, enum exception_code excep)
 
 	asm volatile("mov mdr,%0" : "=d"(mdr));
 	local_save_flags(epsw);
-	local_change_intr_mask_level(NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
+	arch_local_change_intr_mask_level(
+		NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1));
 
 	gdbstub_store_fpu();