diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-12-14 08:16:43 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-12-14 08:16:43 +0100 |
| commit | 919b83452b2e7c1dbced0456015508b4b9585db3 (patch) | |
| tree | 836d0c32b814f7bd5fed83e19b6a2ab77dcf6987 /arch/tile/mm/fault.c | |
| parent | 373da0a2a33018d560afcb2c77f8842985d79594 (diff) | |
| parent | a513f6bab0939800dcf1e7c075e733420cf967c5 (diff) | |
| download | linux-919b83452b2e7c1dbced0456015508b4b9585db3.tar.gz linux-919b83452b2e7c1dbced0456015508b4b9585db3.tar.bz2 linux-919b83452b2e7c1dbced0456015508b4b9585db3.zip | |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
Diffstat (limited to 'arch/tile/mm/fault.c')
| -rw-r--r-- | arch/tile/mm/fault.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c index 25b7b90fd620..c1eaaa1fcc20 100644 --- a/arch/tile/mm/fault.c +++ b/arch/tile/mm/fault.c @@ -54,7 +54,7 @@ static noinline void force_sig_info_fault(const char *type, int si_signo, if (unlikely(tsk->pid < 2)) { panic("Signal %d (code %d) at %#lx sent to %s!", si_signo, si_code & 0xffff, address, - tsk->pid ? "init" : "the idle task"); + is_idle_task(tsk) ? "the idle task" : "init"); } info.si_signo = si_signo; @@ -515,7 +515,7 @@ no_context: if (unlikely(tsk->pid < 2)) { panic("Kernel page fault running %s!", - tsk->pid ? "init" : "the idle task"); + is_idle_task(tsk) ? "the idle task" : "init"); } /* |