From e1fcd10b48775a92b3fe7b13d2c702fab48dfff8 Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 18 Jan 2023 20:07:10 +0100 Subject: [PATCH] Cygwin: memory_init: initialize user heap here Eventually move user heap initialization to memory_init. The call order is not changed. Drop a now useless comment. Signed-off-by: Corinna Vinschen --- winsup/cygwin/mm/shared.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/winsup/cygwin/mm/shared.cc b/winsup/cygwin/mm/shared.cc index e68b506a9..40cdd4722 100644 --- a/winsup/cygwin/mm/shared.cc +++ b/winsup/cygwin/mm/shared.cc @@ -319,14 +319,13 @@ shared_info::initialize () else if (cb != sizeof (*this)) system_printf ("size of shared memory region changed from %lu to %u", sizeof (*this), cb); - /* FIXME? Shouldn't this be in memory_init? */ - cygheap->user_heap.init (); } void memory_init () { shared_info::create (); /* Initialize global shared memory */ + cygheap->user_heap.init (); /* Initialize user heap */ user_info::create (false); /* Initialize per-user shared memory */ /* Initialize tty list session stuff. Doesn't really belong here but this needs to be initialized before any tty or console manipulation