diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:25 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-16 11:22:27 +0100 |
| commit | 006b20fe4c69189b0d854e5eabf269e50ca86cdd (patch) | |
| tree | 948b08825a36114c85ddc2bfcd965c261e32810f /arch/mn10300/kernel/gdb-io-ttysm.c | |
| parent | 5f29805a4f4627e766f862ff9f10c14f5f314359 (diff) | |
| parent | d949750fed168b6553ca11ed19e4affd19d7a4d7 (diff) | |
Merge branch 'perf/urgent' into perf/core
Merge reason: We want to apply a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mn10300/kernel/gdb-io-ttysm.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-io-ttysm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-ttysm.c b/arch/mn10300/kernel/gdb-io-ttysm.c index 97dfda23342c..abdeea153c89 100644 --- a/arch/mn10300/kernel/gdb-io-ttysm.c +++ b/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)); } /* |