diff options
| author |   Tim Yamin <plasmaroo@gentoo.org> | 2005-01-12 20:53:59 +0000 |
|---|---|---|
| committer | Tim Yamin <plasmaroo@gentoo.org> | 2005-01-12 20:53:59 +0000 |
| commit | 94e6f2d160166413671f2ccb862533502dc8f0b4 (patch) | |
| tree | 3914643dc1f608e95e43fdc7a3f53c0b8a2772f8 | |
| parent | migrated from amd64? to emul-linux-x86? dependency. (Manifest recommit) (diff) | |
| download | gentoo-2-94e6f2d160166413671f2ccb862533502dc8f0b4.tar.gz gentoo-2-94e6f2d160166413671f2ccb862533502dc8f0b4.tar.bz2 gentoo-2-94e6f2d160166413671f2ccb862533502dc8f0b4.zip | |
Fix #77094 patch; bug #77458.
| -rw-r--r-- | sys-kernel/win4lin-sources/ChangeLog | 5 | ||||
| -rw-r--r-- | sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.77094.patch | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog index aac64e5261a8..366a56828524 100644 --- a/sys-kernel/win4lin-sources/ChangeLog +++ b/sys-kernel/win4lin-sources/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-kernel/win4lin-sources # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.49 2005/01/09 13:00:28 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.50 2005/01/12 20:53:59 plasmaroo Exp $ + + 12 Jan 2005; <plasmaroo@gentoo.org> files/win4lin-sources-2.6.9.77094.patch: + Fix #77094 patch; bug #77458. *win4lin-sources-2.6.9-r6 (09 Jan 2005) diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.77094.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.77094.patch index 40ebbe843021..6b2c7bdb2317 100644 --- a/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.77094.patch +++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.9.77094.patch @@ -64,7 +64,7 @@ diff -urp linux-2.6.8.1-r7/mm/mmap.c linux-2.6.8.1-r8/mm/mmap.c } + if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && + ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { ++ current->rlim[RLIMIT_MEMLOCK].rlim_cur) { + anon_vma_unlock(vma); + vm_unacct_memory(grow); + return -ENOMEM; @@ -78,7 +78,7 @@ diff -urp linux-2.6.8.1-r7/mm/mmap.c linux-2.6.8.1-r8/mm/mmap.c } + if ((vma->vm_flags & VM_LOCKED) && !capable(CAP_IPC_LOCK) && + ((vma->vm_mm->locked_vm + grow) << PAGE_SHIFT) > -+ current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur) { ++ current->rlim[RLIMIT_MEMLOCK].rlim_cur) { + anon_vma_unlock(vma); + vm_unacct_memory(grow); + return -ENOMEM; |