From: Tim Yamin <plasmaroo@gentoo.org>
Date: Wed, 12 Jan 2005 20:53:59 +0000 (+0000)
Subject: Fix #77094 patch; bug #77458.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2c6d39e15f932bfcd1fe9f7bcca3f1f7e8c02b3;p=gentoo.git

Fix #77094 patch; bug #77458.
---

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/Manifest b/sys-kernel/win4lin-sources/Manifest
index 889d62836d0c..3d4ce22c971f 100644
--- a/sys-kernel/win4lin-sources/Manifest
+++ b/sys-kernel/win4lin-sources/Manifest
@@ -1,5 +1,5 @@
 MD5 fc7c3627da4decfab31196251e6a0292 win4lin-sources-2.6.9-r6.ebuild 1714
-MD5 bec4f315218793ddf040fced3b0d8019 ChangeLog 12377
+MD5 4a1d6555d6d7b8b808ca46e2e4591b14 ChangeLog 12489
 MD5 608fe99985244b0445f76cee44c9ae14 metadata.xml 290
 MD5 af193ee9e349c9f1ba1524de83719da1 win4lin-sources-2.4.26-r12.ebuild 3210
 MD5 530630d25910e6bd9376b63ea099655f files/win4lin-sources-2.6.9.AF_UNIX.patch 469
@@ -9,7 +9,7 @@ MD5 ad3a58c3613a65e38853cd7a5f4d1bac files/digest-win4lin-sources-2.4.26-r12 356
 MD5 655251f31f0bdc85bdd0cd0280af22b7 files/win4lin-sources-2.6.9.75963.patch 979
 MD5 4d656fa3f3a47df751c0d78b64ed8353 files/win4lin-sources-2.6.9.AF_UNIX.SELinux.patch 1761
 MD5 f211ff52010dfc1d94d2dcfc06636fd9 files/win4lin-sources-2.6.9.shmLocking.patch 1757
-MD5 362eb8e147238e1c4ea006ee163a8db9 files/win4lin-sources-2.6.9.77094.patch 5209
+MD5 9eda91c0c7c7cd61ac3fbc4b309de3c0 files/win4lin-sources-2.6.9.77094.patch 5193
 MD5 53fe3d26f6fc45487d69895fc07770cb files/win4lin-sources-2.6.9.binfmt_elf.patch 2350
 MD5 8812f60b8d02b0b3b4c46a3311ddd851 files/win4lin-sources-2.6.9.smbfs.patch 2662
 MD5 a9991d6324d7404ed99e79be6e44e9de files/win4lin-sources-2.6.binfmt_elf.patch 2348
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;