3 files changed, 6 insertions, 5 deletions

diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu
index d9dd62a565a9..a380167a13cf 100644
--- a/arch/h8300/Kconfig.cpu
+++ b/arch/h8300/Kconfig.cpu
@@ -180,4 +180,7 @@ config CPU_H8S
 config PREEMPT
         bool "Preemptible Kernel"
         default n
+
+source "mm/Kconfig"
+
 endmenu
diff --git a/arch/h8300/kernel/signal.c b/arch/h8300/kernel/signal.c
index a4799d633ef4..5aab87eae1f9 100644
--- a/arch/h8300/kernel/signal.c
+++ b/arch/h8300/kernel/signal.c
@@ -517,10 +517,8 @@ asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset)
         if ((regs->ccr & 0x10))
                 return 1;
 
-        if (current->flags & PF_FREEZE) {
-                refrigerator(0);
+        if (try_to_freeze())
                 goto no_signal;
-        }
 
         current->thread.esp0 = (unsigned long) regs;
 
diff --git a/arch/h8300/platform/h8300h/ptrace_h8300h.c b/arch/h8300/platform/h8300h/ptrace_h8300h.c
index 18e51a7167d3..6ac93c05a1ae 100644
--- a/arch/h8300/platform/h8300h/ptrace_h8300h.c
+++ b/arch/h8300/platform/h8300h/ptrace_h8300h.c
@@ -245,12 +245,12 @@ static unsigned short *getnextpc(struct task_struct *child, unsigned short *pc)
                                                 addr = h8300_get_reg(child, regno-1+PT_ER1);
                                         return (unsigned short *)addr;
                                 case relb:
-                                        if ((inst = 0x55) || isbranch(child,inst & 0x0f))
+                                        if (inst == 0x55 || isbranch(child,inst & 0x0f))
                                                 pc = (unsigned short *)((unsigned long)pc +
                                                                        ((signed char)(*fetch_p)));
                                         return pc+1; /* skip myself */
                                 case relw:
-                                        if ((inst = 0x5c) || isbranch(child,(*fetch_p & 0xf0) >> 4))
+                                        if (inst == 0x5c || isbranch(child,(*fetch_p & 0xf0) >> 4))
                                                 pc = (unsigned short *)((unsigned long)pc +
                                                                        ((signed short)(*(pc+1))));
                                         return pc+2; /* skip myself */