From bb137bc9bb24ecb64eb8240311605ac42517ef5d Mon Sep 17 00:00:00 2001 From: NAKAMURA Gou Date: Tue, 17 Feb 2015 18:09:10 +0900 Subject: [PATCH] make brk region just follow data region This effectively reverts commit d70dd2338c6b76331b6fae89b79dd56756314744. --- kernel/host.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/kernel/host.c b/kernel/host.c index 38c0271e..037eb1c6 100644 --- a/kernel/host.c +++ b/kernel/host.c @@ -174,23 +174,8 @@ int prepare_process_ranges_args_envs(struct process *proc, pn->entry); } -#if 1 - /* - Fix for the problem where brk grows to hit .bss section - when using dynamically linked executables. - Test code resides in /home/takagi/project/mpich/src/brk_icc_mic. - This is because when using - ld.so (i.e. using shared objects), mckernel/kernel/host.c sets "brk" to - the end of .bss of ld.so (e.g. 0x21f000), and then ld.so places a - main-program after this (e.g. 0x400000), so "brk" will hit .bss - eventually. - */ - proc->vm->region.brk_start = proc->vm->region.brk_end = - (USER_END / 4) & LARGE_PAGE_MASK; -#else proc->vm->region.brk_start = proc->vm->region.brk_end = proc->vm->region.data_end; -#endif /* Map, copy and update args and envs */ flags = VR_PROT_READ | VR_PROT_WRITE;