summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2005-03-16 20:54:26 +0000
committerTim Yamin <plasmaroo@gentoo.org>2005-03-16 20:54:26 +0000
commit58c1806e814896b5ce438f0b0e74f2515c2e3c92 (patch)
treec6a65a602c67b64175c34d1790dea27abe776833
parentSync to Linux 2.6.11.4. Fix silent speaker on 4.1 ALSA surround. Fix ALPS tou... (diff)
downloadgentoo-2-58c1806e814896b5ce438f0b0e74f2515c2e3c92.tar.gz
gentoo-2-58c1806e814896b5ce438f0b0e74f2515c2e3c92.tar.bz2
gentoo-2-58c1806e814896b5ce438f0b0e74f2515c2e3c92.zip
Fix 2.6 #77666 patch.
(Portage version: 2.0.51.19)
-rw-r--r--sys-kernel/usermode-sources/ChangeLog5
-rw-r--r--sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch4
2 files changed, 6 insertions, 3 deletions
diff --git a/sys-kernel/usermode-sources/ChangeLog b/sys-kernel/usermode-sources/ChangeLog
index fc0f21c14d2c..31db65578802 100644
--- a/sys-kernel/usermode-sources/ChangeLog
+++ b/sys-kernel/usermode-sources/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-kernel/usermode-sources
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.61 2005/03/07 23:17:35 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/usermode-sources/ChangeLog,v 1.62 2005/03/16 20:54:26 plasmaroo Exp $
+
+ 16 Mar 2005; <plasmaroo@gentoo.org> files/usermode-sources-2.6.77666.patch:
+ Fix 2.6 #77666 patch.
07 Mar 2005; <plasmaroo@gentoo.org> usermode-sources-2.6.8.1-r9.ebuild,
+files/usermode-sources-2.6.78362.patch:
diff --git a/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch b/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
index 5702aa0d46fd..e0d393235123 100644
--- a/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
+++ b/sys-kernel/usermode-sources/files/usermode-sources-2.6.77666.patch
@@ -13,10 +13,10 @@ diff -urNpX /usr/src/dontdiff linux-2.6.8.1-r9/mm/mmap.c linux-dsd/mm/mmap.c
+static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, unsigned long grow)
+{
+ struct mm_struct *mm = vma->vm_mm;
-+ struct rlimit *rlim = current->signal->rlim;
++ struct rlimit *rlim = current->rlim;
+
+ /* address space limit tests */
-+ rlim = current->signal->rlim;
++ rlim = current->rlim;
+ if (mm->total_vm + grow > rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT)
+ return -ENOMEM;
+