From c9db05056e78670a30f9904ce487d7f914278059 Mon Sep 17 00:00:00 2001 From: "Evgeny Grechnikov (Diamond)" Date: Sat, 26 Dec 2009 12:35:19 +0000 Subject: [PATCH] kernel heap size restored to correct value after rev. 1130 git-svn-id: svn://kolibrios.org@1332 a494cfbc-eb01-0410-851d-a64ba20cac60 --- kernel/trunk/core/heap.inc | 2 +- kernel/trunk/init.inc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/trunk/core/heap.inc b/kernel/trunk/core/heap.inc index 2aee238a59..e9d9ed7125 100644 --- a/kernel/trunk/core/heap.inc +++ b/kernel/trunk/core/heap.inc @@ -140,7 +140,7 @@ proc init_kernel_heap mov ecx, [pg_data.kernel_pages] shl ecx, 12 - sub ecx, HEAP_BASE+4096*MEM_BLOCK_SIZE + sub ecx, HEAP_BASE-OS_BASE+4096*MEM_BLOCK_SIZE mov [heap_size], ecx mov [heap_free], ecx mov [ebx+block_size], ecx diff --git a/kernel/trunk/init.inc b/kernel/trunk/init.inc index 02e94791e9..5c91ea00cb 100644 --- a/kernel/trunk/init.inc +++ b/kernel/trunk/init.inc @@ -114,9 +114,9 @@ proc init_mem mov edx, (OS_BASE/4096) jmp .set @@: - cmp edx, (HEAP_BASE+HEAP_MIN_SIZE)/4096 + cmp edx, (HEAP_BASE-OS_BASE+HEAP_MIN_SIZE)/4096 jae .set - mov edx, (HEAP_BASE+HEAP_MIN_SIZE)/4096 + mov edx, (HEAP_BASE-OS_BASE+HEAP_MIN_SIZE)/4096 .set: mov [pg_data.kernel_pages-OS_BASE], edx shr edx, 10