From 88cfa4fb99081e2ae4f2d2ac8491b51645aec4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 18 May 2004 10:27:28 +0000 Subject: [PATCH] Applied Jack Burton's patch to fix the boot problems on many systems: find_real_mem_size must not be called with interrupts turned off. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7609 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kernel/boot/arch/x86/bootblock.asm | 2 +- src/kernel/boot/arch/x86/bootblock.bin | Bin 1024 -> 1024 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kernel/boot/arch/x86/bootblock.asm b/src/kernel/boot/arch/x86/bootblock.asm index 7d4ca6ee31..adc3543866 100644 --- a/src/kernel/boot/arch/x86/bootblock.asm +++ b/src/kernel/boot/arch/x86/bootblock.asm @@ -94,13 +94,13 @@ unreal: call disable_floppy_motor mov si,okmsg call print - cli ; uncomment the next two lines to enable the VESA mode switch ; call enable_vesa ; mov [in_vesa],al call find_mem_size_real + cli mov ebx,[dword 0x100074] ; load dword at rel. address 0x74 from read-destination-buffer add ebx,0x101000 ; for stage2 entry diff --git a/src/kernel/boot/arch/x86/bootblock.bin b/src/kernel/boot/arch/x86/bootblock.bin index 4804db82c92b2af10a8fdee2e2ef5a067167c338..7b135b1df140fe657ea6d5a729d372051afc12fe 100644 GIT binary patch delta 15 WcmZqRXyBMo%JO0(Q2F8t*?aTl%QU+lF