DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-10 20:36:48 +00:00
Code Issues Releases Wiki Activity

修复内存bug与grub安装脚本的错误 (#129)

Browse Source 
* 修复内存bug与grub安装脚本的错误

* 修改小bug
This commit is contained in:
YJwu2023 2022-12-28 19:35:17 +08:00 committed by GitHub
parent adc1846b06
commit 882f0b7e74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel/src/mm/mm.c
View File

@ -196,7 +196,7 @@ void mm_init()
memory_management_struct.zones_struct_len = (memory_management_struct.count_zones * sizeof(struct Zone) + sizeof(ul) - 1) & (~(sizeof(ul) - 1)); memory_management_struct.zones_struct_len = (memory_management_struct.count_zones * sizeof(struct Zone) + sizeof(ul) - 1) & (~(sizeof(ul) - 1));
ZONE_DMA_INDEX = 0; ZONE_DMA_INDEX = 0;
ZONE_NORMAL_INDEX = 0; ZONE_NORMAL_INDEX = memory_management_struct.count_zones ;
ZONE_UNMAPPED_INDEX = 0; ZONE_UNMAPPED_INDEX = 0;
// kdebug("ZONE_DMA_INDEX=%d\tZONE_NORMAL_INDEX=%d\tZONE_UNMAPPED_INDEX=%d", ZONE_DMA_INDEX, ZONE_NORMAL_INDEX, ZONE_UNMAPPED_INDEX); // kdebug("ZONE_DMA_INDEX=%d\tZONE_NORMAL_INDEX=%d\tZONE_UNMAPPED_INDEX=%d", ZONE_DMA_INDEX, ZONE_NORMAL_INDEX, ZONE_UNMAPPED_INDEX);
@ -323,7 +323,7 @@ struct Page *alloc_pages(unsigned int zone_select, int num, ul flags)
break; break;
} }
for (int i = zone_start; i <= zone_end; ++i) for (int i = zone_start; i < zone_end; ++i)
{ {
if ((memory_management_struct.zones_struct + i)->count_pages_free < num) if ((memory_management_struct.zones_struct + i)->count_pages_free < num)
continue; continue;

6
tools/grub_auto_install.sh
View File

@ -4,9 +4,9 @@ grub_dir_i386_efi=${ABS_PREFIX}/arch/i386/efi/grub
grub_dir_i386_legacy=${ABS_PREFIX}/arch/i386/legacy/grub grub_dir_i386_legacy=${ABS_PREFIX}/arch/i386/legacy/grub
grub_dir_x86_64_efi=${ABS_PREFIX}/arch/x86_64/efi/grub grub_dir_x86_64_efi=${ABS_PREFIX}/arch/x86_64/efi/grub
mkdir -p ${grub_dir_i386_efi} sudo mkdir -p ${grub_dir_i386_efi}
mkdir -p ${grub_dir_i386_legacy} sudo mkdir -p ${grub_dir_i386_legacy}
mkdir -p ${grub_dir_x86_64_efi} sudo mkdir -p ${grub_dir_x86_64_efi}
# 防止外层声明了环境变量，影响到grub的编译 # 防止外层声明了环境变量，影响到grub的编译
export CC=gcc export CC=gcc