diff options
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/kernel/setup.c | 2 | ||||
-rw-r--r-- | arch/frv/kernel/signal.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c index ef6865f0b9..767ebb55bd 100644 --- a/arch/frv/kernel/setup.c +++ b/arch/frv/kernel/setup.c | |||
@@ -790,12 +790,10 @@ void __init setup_arch(char **cmdline_p) | |||
790 | #ifndef CONFIG_GDBSTUB_UART0 | 790 | #ifndef CONFIG_GDBSTUB_UART0 |
791 | __reg(UART0_BASE + UART_IER * 8) = 0; | 791 | __reg(UART0_BASE + UART_IER * 8) = 0; |
792 | early_serial_setup(&__frv_uart0); | 792 | early_serial_setup(&__frv_uart0); |
793 | // register_serial(&__frv_uart0); | ||
794 | #endif | 793 | #endif |
795 | #ifndef CONFIG_GDBSTUB_UART1 | 794 | #ifndef CONFIG_GDBSTUB_UART1 |
796 | __reg(UART1_BASE + UART_IER * 8) = 0; | 795 | __reg(UART1_BASE + UART_IER * 8) = 0; |
797 | early_serial_setup(&__frv_uart1); | 796 | early_serial_setup(&__frv_uart1); |
798 | // register_serial(&__frv_uart1); | ||
799 | #endif | 797 | #endif |
800 | 798 | ||
801 | #if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH) | 799 | #if defined(CONFIG_CHR_DEV_FLASH) || defined(CONFIG_BLK_DEV_FLASH) |
diff --git a/arch/frv/kernel/signal.c b/arch/frv/kernel/signal.c index d8d8f3d430..36a2dffc8e 100644 --- a/arch/frv/kernel/signal.c +++ b/arch/frv/kernel/signal.c | |||
@@ -536,10 +536,8 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) | |||
536 | if (!user_mode(regs)) | 536 | if (!user_mode(regs)) |
537 | return 1; | 537 | return 1; |
538 | 538 | ||
539 | if (current->flags & PF_FREEZE) { | 539 | if (try_to_freeze()) |
540 | refrigerator(0); | ||
541 | goto no_signal; | 540 | goto no_signal; |
542 | } | ||
543 | 541 | ||
544 | if (!oldset) | 542 | if (!oldset) |
545 | oldset = ¤t->blocked; | 543 | oldset = ¤t->blocked; |