aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/lib/usercopy_32.c2
-rw-r--r--arch/x86/mm/fault_32.c2
-rw-r--r--arch/x86/mm/fault_64.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index 9f38b12b4af1..8bab2b2efaff 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -748,7 +748,7 @@ survive:
748 retval = get_user_pages(current, current->mm, 748 retval = get_user_pages(current, current->mm,
749 (unsigned long )to, 1, 1, 0, &pg, NULL); 749 (unsigned long )to, 1, 1, 0, &pg, NULL);
750 750
751 if (retval == -ENOMEM && is_init(current)) { 751 if (retval == -ENOMEM && is_global_init(current)) {
752 up_read(&current->mm->mmap_sem); 752 up_read(&current->mm->mmap_sem);
753 congestion_wait(WRITE, HZ/50); 753 congestion_wait(WRITE, HZ/50);
754 goto survive; 754 goto survive;
diff --git a/arch/x86/mm/fault_32.c b/arch/x86/mm/fault_32.c
index 6555c3d14371..4fc5e400cf0a 100644
--- a/arch/x86/mm/fault_32.c
+++ b/arch/x86/mm/fault_32.c
@@ -587,7 +587,7 @@ no_context:
587 */ 587 */
588out_of_memory: 588out_of_memory:
589 up_read(&mm->mmap_sem); 589 up_read(&mm->mmap_sem);
590 if (is_init(tsk)) { 590 if (is_global_init(tsk)) {
591 yield(); 591 yield();
592 down_read(&mm->mmap_sem); 592 down_read(&mm->mmap_sem);
593 goto survive; 593 goto survive;
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 5e0e54906c48..5149ac136a5d 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -554,7 +554,7 @@ no_context:
554 */ 554 */
555out_of_memory: 555out_of_memory:
556 up_read(&mm->mmap_sem); 556 up_read(&mm->mmap_sem);
557 if (is_init(current)) { 557 if (is_global_init(current)) {
558 yield(); 558 yield();
559 goto again; 559 goto again;
560 } 560 }