diff options
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/mm/fault.c | 2 | ||||
-rw-r--r-- | arch/powerpc/platforms/pseries/ras.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 77953f41d754..e8fa50624b70 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c | |||
@@ -386,7 +386,7 @@ bad_area_nosemaphore: | |||
386 | */ | 386 | */ |
387 | out_of_memory: | 387 | out_of_memory: |
388 | up_read(&mm->mmap_sem); | 388 | up_read(&mm->mmap_sem); |
389 | if (current->pid == 1) { | 389 | if (is_init(current)) { |
390 | yield(); | 390 | yield(); |
391 | down_read(&mm->mmap_sem); | 391 | down_read(&mm->mmap_sem); |
392 | goto survive; | 392 | goto survive; |
diff --git a/arch/powerpc/platforms/pseries/ras.c b/arch/powerpc/platforms/pseries/ras.c index 903115d67fdc..311ed1993fc0 100644 --- a/arch/powerpc/platforms/pseries/ras.c +++ b/arch/powerpc/platforms/pseries/ras.c | |||
@@ -337,7 +337,7 @@ static int recover_mce(struct pt_regs *regs, struct rtas_error_log * err) | |||
337 | err->disposition == RTAS_DISP_NOT_RECOVERED && | 337 | err->disposition == RTAS_DISP_NOT_RECOVERED && |
338 | err->target == RTAS_TARGET_MEMORY && | 338 | err->target == RTAS_TARGET_MEMORY && |
339 | err->type == RTAS_TYPE_ECC_UNCORR && | 339 | err->type == RTAS_TYPE_ECC_UNCORR && |
340 | !(current->pid == 0 || current->pid == 1)) { | 340 | !(current->pid == 0 || is_init(current))) { |
341 | /* Kill off a user process with an ECC error */ | 341 | /* Kill off a user process with an ECC error */ |
342 | printk(KERN_ERR "MCE: uncorrectable ecc error for pid %d\n", | 342 | printk(KERN_ERR "MCE: uncorrectable ecc error for pid %d\n", |
343 | current->pid); | 343 | current->pid); |