Attachment #27353 for bug #64492

View | Details | Raw Unified | Return to bug 64492
Collapse All | Expand All

Lines 142-148 Link Here

(-)linux-2.4.28.orig/arch/ia64/kernel/sys_ia64.c (-1 / +1 lines)
142	goto out;	142	goto out;
143		143
144	/* Ok, looks good - let it rip. */	144	/* Ok, looks good - let it rip. */
145	if (do_brk(oldbrk, newbrk-oldbrk) != oldbrk)	145	if (__do_brk(oldbrk, newbrk-oldbrk) != oldbrk)
146	goto out;	146	goto out;
147	set_brk:	147	set_brk:
148	mm->brk = brk;	148	mm->brk = brk;

Lines 588-594 Link Here

(-)linux-2.4.28.orig/arch/mips/kernel/sysirix.c (-1 / +1 lines)
588	* Ok, looks good - let it rip.	588	* Ok, looks good - let it rip.
589	*/	589	*/
590	mm->brk = brk;	590	mm->brk = brk;
591	do_brk(oldbrk, newbrk-oldbrk);	591	__do_brk(oldbrk, newbrk-oldbrk);
592	ret = 0;	592	ret = 0;
593		593
594	out:	594	out:

Lines 205-211 Link Here

(-)linux-2.4.28.orig/arch/sparc/kernel/sys_sunos.c (-1 / +1 lines)
205	* Ok, we have probably got enough memory - let it rip.	205	* Ok, we have probably got enough memory - let it rip.
206	*/	206	*/
207	current->mm->brk = brk;	207	current->mm->brk = brk;
208	do_brk(oldbrk, newbrk-oldbrk);	208	__do_brk(oldbrk, newbrk-oldbrk);
209	retval = 0;	209	retval = 0;
210	out:	210	out:
211	up_write(&current->mm->mmap_sem);	211	up_write(&current->mm->mmap_sem);

Lines 167-173 Link Here

(-)linux-2.4.28.orig/arch/sparc64/kernel/sys_sunos32.c (-1 / +1 lines)
167	goto out;	167	goto out;
168	/* Ok, we have probably got enough memory - let it rip. */	168	/* Ok, we have probably got enough memory - let it rip. */
169	current->mm->brk = brk;	169	current->mm->brk = brk;
170	do_brk(oldbrk, newbrk-oldbrk);	170	__do_brk(oldbrk, newbrk-oldbrk);
171	retval = 0;	171	retval = 0;
172	out:	172	out:
173	up_write(&current->mm->mmap_sem);	173	up_write(&current->mm->mmap_sem);

Lines 574-579 Link Here

(-)linux-2.4.28.orig/include/linux/mm.h (+1 lines)
574		574
575	extern int do_munmap(struct mm_struct *, unsigned long, size_t);	575	extern int do_munmap(struct mm_struct *, unsigned long, size_t);
576		576
		577	extern unsigned long __do_brk(unsigned long, unsigned long);
577	extern unsigned long do_brk(unsigned long, unsigned long);	578	extern unsigned long do_brk(unsigned long, unsigned long);
578		579
579	static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)	580	static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)

Lines 87-92 Link Here

(-)linux-2.4.28.orig/kernel/ksyms.c (+1 lines)
87	/* process memory management */	87	/* process memory management */
88	EXPORT_SYMBOL(do_mmap_pgoff);	88	EXPORT_SYMBOL(do_mmap_pgoff);
89	EXPORT_SYMBOL(do_munmap);	89	EXPORT_SYMBOL(do_munmap);
		90	EXPORT_SYMBOL(__do_brk);
90	EXPORT_SYMBOL(do_brk);	91	EXPORT_SYMBOL(do_brk);
91	EXPORT_SYMBOL(exit_mm);	92	EXPORT_SYMBOL(exit_mm);
92	EXPORT_SYMBOL(exit_files);	93	EXPORT_SYMBOL(exit_files);




		goto out;

	/* Ok, looks good - let it rip. */
	if (__do_brk(oldbrk, newbrk-oldbrk) != oldbrk)
		goto out;
set_brk:
	mm->brk = brk;

	return ret;
}


/*
 *  this is really a simplified "do_mmap".  it only handles
 *  anonymous maps.  eventually we may be able to do some
 *  brk-specific accounting here.
 */
unsigned long __do_brk(unsigned long addr, unsigned long len)
{
	struct mm_struct * mm = current->mm;
	struct vm_area_struct * vma, * prev;

	return addr;
}

/* locking version of __do_brk. */
unsigned long do_brk(unsigned long addr, unsigned long len)
{
	unsigned long ret;

	down_write(&current->mm->mmap_sem);
	ret = __do_brk(addr, len);
	up_write(&current->mm->mmap_sem);

	return ret;
}

/* Build the RB tree corresponding to the VMA list. */
void build_mmap_rb(struct mm_struct * mm)
{

Return to bug 64492

Lines 181-187 Link Here

(-)linux-2.4.28.orig/mm/mmap.c (-2 / +15 lines)
181	goto out;	181	goto out;
182		182
183	/* Ok, looks good - let it rip. */	183	/* Ok, looks good - let it rip. */
184	if (do_brk(oldbrk, newbrk-oldbrk) != oldbrk)	184	if (__do_brk(oldbrk, newbrk-oldbrk) != oldbrk)
185	goto out;	185	goto out;
186	set_brk:	186	set_brk:
187	mm->brk = brk;	187	mm->brk = brk;
Lines 1031-1042 Link Here
1031	return ret;	1031	return ret;
1032	}	1032	}
1033		1033
		1034
1034	/*	1035	/*
1035	* this is really a simplified "do_mmap". it only handles	1036	* this is really a simplified "do_mmap". it only handles
1036	* anonymous maps. eventually we may be able to do some	1037	* anonymous maps. eventually we may be able to do some
1037	* brk-specific accounting here.	1038	* brk-specific accounting here.
1038	*/	1039	*/
1039	unsigned long do_brk(unsigned long addr, unsigned long len)	1040	unsigned long __do_brk(unsigned long addr, unsigned long len)
1040	{	1041	{
1041	struct mm_struct * mm = current->mm;	1042	struct mm_struct * mm = current->mm;
1042	struct vm_area_struct * vma, * prev;	1043	struct vm_area_struct * vma, * prev;
Lines 1116-1121 Link Here
1116	return addr;	1117	return addr;
1117	}	1118	}
1118		1119
		1120	/* locking version of __do_brk. */
		1121	unsigned long do_brk(unsigned long addr, unsigned long len)
		1122	{
		1123	unsigned long ret;
		1124
		1125	down_write(&current->mm->mmap_sem);
		1126	ret = __do_brk(addr, len);
		1127	up_write(&current->mm->mmap_sem);
		1128
		1129	return ret;
		1130	}
		1131
1119	/* Build the RB tree corresponding to the VMA list. */	1132	/* Build the RB tree corresponding to the VMA list. */
1120	void build_mmap_rb(struct mm_struct * mm)	1133	void build_mmap_rb(struct mm_struct * mm)
1121	{	1134	{