diff --git a/[refs] b/[refs] index 5a2e28cddec1..31ee14784e60 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a77c64c1a641950626181b4857abb701d8f38ccc +refs/heads/master: bac9c66cd25e134077b284fc59bee6e5a8475d33 diff --git a/trunk/arch/s390/mm/fault.c b/trunk/arch/s390/mm/fault.c index 44f0cda7e72e..a393c308bb29 100644 --- a/trunk/arch/s390/mm/fault.c +++ b/trunk/arch/s390/mm/fault.c @@ -355,6 +355,7 @@ do_exception(struct pt_regs *regs, unsigned long error_code, int is_protection) up_read(&mm->mmap_sem); if (tsk->pid == 1) { yield(); + down_read(&mm->mmap_sem); goto survive; } printk("VM: killing process %s\n", tsk->comm);