2 files changed, 4 insertions, 4 deletions

diff --git a/arch/avr32/kernel/traps.c b/arch/avr32/kernel/traps.c
index 9a73ce7eb50f..8a7caf8e7b45 100644
--- a/arch/avr32/kernel/traps.c
+++ b/arch/avr32/kernel/traps.c
@@ -89,7 +89,7 @@ void _exception(long signr, struct pt_regs *regs, int code,
          * generate the same exception over and over again and we get
          * nowhere.  Better to kill it and let the kernel panic.
          */
-        if (is_init(current)) {
+        if (is_global_init(current)) {
                 __sighandler_t handler;
 
                 spin_lock_irq(&current->sighand->siglock);
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
index 11472f8701bd..6560cb18b4e3 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -160,7 +160,7 @@ bad_area:
                 if (exception_trace && printk_ratelimit())
                         printk("%s%s[%d]: segfault at %08lx pc %08lx "
                                "sp %08lx ecr %lu\n",
-                               is_init(tsk) ? KERN_EMERG : KERN_INFO,
+                               is_global_init(tsk) ? KERN_EMERG : KERN_INFO,
                                tsk->comm, tsk->pid, address, regs->pc,
                                regs->sp, ecr);
                 _exception(SIGSEGV, regs, code, address);
@@ -209,7 +209,7 @@ no_context:
          */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        if (is_init(current)) {
+        if (is_global_init(current)) {
                 yield();
                 down_read(&mm->mmap_sem);
                 goto survive;
@@ -231,7 +231,7 @@ do_sigbus:
         if (exception_trace)
                 printk("%s%s[%d]: bus error at %08lx pc %08lx "
                        "sp %08lx ecr %lu\n",
-                       is_init(tsk) ? KERN_EMERG : KERN_INFO,
+                       is_global_init(tsk) ? KERN_EMERG : KERN_INFO,
                        tsk->comm, tsk->pid, address, regs->pc,
                        regs->sp, ecr);