From 97c2b2125414a8e2549b48534ee21207fb9da445 Mon Sep 17 00:00:00 2001
From: Stefan Lankes <slankes@eonerc.rwth-aachen.de>
Date: Wed, 27 Jul 2016 22:32:16 +0200
Subject: [PATCH] reactivate PCI support for the single-kernel version of
 HermitCore

---
 hermit/arch/x86/include/asm/processor.h | 3 ++-
 hermit/arch/x86/kernel/pci.c            | 3 ---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/hermit/arch/x86/include/asm/processor.h b/hermit/arch/x86/include/asm/processor.h
index e188f7470..7f5db2eb9 100644
--- a/hermit/arch/x86/include/asm/processor.h
+++ b/hermit/arch/x86/include/asm/processor.h
@@ -754,7 +754,6 @@ inline static int system_init(void)
 {
 	gdt_install();
 	cpu_detection();
-	//pci_init();
 
 	return 0;
 }
@@ -798,6 +797,8 @@ inline static int system_calibration(void)
 	size_t cr0;
 
 	apic_init();
+	if (is_single_kernel())
+		pci_init();
 	register_task();
 
 	// set task switched flag for the first FPU access
diff --git a/hermit/arch/x86/kernel/pci.c b/hermit/arch/x86/kernel/pci.c
index 24bb3a035..330f1fe84 100644
--- a/hermit/arch/x86/kernel/pci.c
+++ b/hermit/arch/x86/kernel/pci.c
@@ -25,7 +25,6 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#if 0
 #include <hermit/stdio.h>
 #include <hermit/string.h>
 #include <hermit/errno.h>
@@ -215,5 +214,3 @@ int print_pci_adapters(void)
 
 	return 0;
 }
-
-#endif