diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-12-16 05:22:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-12-16 05:22:27 -0500 |
| commit | 006b20fe4c69189b0d854e5eabf269e50ca86cdd (patch) | |
| tree | 948b08825a36114c85ddc2bfcd965c261e32810f /arch/mn10300/kernel/gdb-io-serial.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-serial.c')
| -rw-r--r-- | arch/mn10300/kernel/gdb-io-serial.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/kernel/gdb-io-serial.c b/arch/mn10300/kernel/gdb-io-serial.c index 0d5d63c91dc3..f28dc99c6f72 100644 --- a/arch/mn10300/kernel/gdb-io-serial.c +++ b/arch/mn10300/kernel/gdb-io-serial.c | |||
| @@ -73,7 +73,8 @@ void gdbstub_io_init(void) | |||
| 73 | GDBPORT_SERIAL_IER = UART_IER_RDI | UART_IER_RLSI; | 73 | GDBPORT_SERIAL_IER = UART_IER_RDI | UART_IER_RLSI; |
| 74 | 74 | ||
| 75 | /* permit level 0 IRQs to take place */ | 75 | /* permit level 0 IRQs to take place */ |
| 76 | local_change_intr_mask_level(NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1)); | 76 | arch_local_change_intr_mask_level( |
| 77 | NUM2EPSW_IM(CONFIG_GDBSTUB_IRQ_LEVEL + 1)); | ||
| 77 | } | 78 | } |
| 78 | 79 | ||
| 79 | /* | 80 | /* |