From 609e822a2b8d15a292cacdae774233652fe30674 Mon Sep 17 00:00:00 2001
From: Ivan Baravy <dunkaist@gmail.com>
Date: Wed, 28 Oct 2020 18:08:08 +0000
Subject: [PATCH] Fix r8111 for APIC mode: Don't skip LAPIC initialization if
 already mapped.

git-svn-id: svn://kolibrios.org@8120 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 kernel/trunk/core/apic.inc | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/trunk/core/apic.inc b/kernel/trunk/core/apic.inc
index d6dbc297cd..21fa3c4b38 100644
--- a/kernel/trunk/core/apic.inc
+++ b/kernel/trunk/core/apic.inc
@@ -155,11 +155,12 @@ end if
 align 4
 LAPIC_init:
 
-        cmp     [LAPIC_BASE], 0
-        jne     .done
-
+        mov     eax, [LAPIC_BASE]
+        test    eax, eax
+        jnz     @f
         stdcall map_io_mem, [acpi_lapic_base], 0x1000, PG_GLOBAL+PG_NOCACHE+PG_SWR
         mov     [LAPIC_BASE], eax
+@@:
         mov     esi, eax
 
         ; Program Destination Format Register for Flat mode.