r2286 - trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches

[Andres Salomon]

Author: dilinger-guest
Date: 2005-01-13 08:30:01 +0100 (Thu, 13 Jan 2005)
New Revision: 2286

Modified:
   trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/033-rlimit_memlock_check.dpatch
Log:
ok, this is what i meant to cross fingers for


Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/033-rlimit_memlock_check.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/033-rlimit_memlock_check.dpatch	2005-01-13 07:26:36 UTC (rev 2285)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/033-rlimit_memlock_check.dpatch	2005-01-13 07:30:01 UTC (rev 2286)
@@ -52,10 +52,10 @@
 +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;
 +
@@ -113,9 +113,9 @@
 -		return -ENOMEM;
 -	}
 -	
--	if (address - vma->vm_start > current->signal->rlim[RLIMIT_STACK].rlim_cur ||
+-	if (address - vma->vm_start > current->rlim[RLIMIT_STACK].rlim_cur ||
 -			((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
--			current->signal->rlim[RLIMIT_AS].rlim_cur) {
+-			current->rlim[RLIMIT_AS].rlim_cur) {
 -		anon_vma_unlock(vma);
 -		vm_unacct_memory(grow);
 -		return -ENOMEM;
@@ -157,9 +157,9 @@
 -		return -ENOMEM;
 -	}
 -	
--	if (vma->vm_end - address > current->signal->rlim[RLIMIT_STACK].rlim_cur ||
+-	if (vma->vm_end - address > current->rlim[RLIMIT_STACK].rlim_cur ||
 -			((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) >
--			current->signal->rlim[RLIMIT_AS].rlim_cur) {
+-			current->rlim[RLIMIT_AS].rlim_cur) {
 -		anon_vma_unlock(vma);
 -		vm_unacct_memory(grow);
 -		return -ENOMEM;