From 9c2d0716543f8284deeb918615693ee714b220cb Mon Sep 17 00:00:00 2001
From: Reto Buerki <reet@codelabs.ch>
Date: Thu, 26 Feb 2015 14:01:16 +0100
Subject: [PATCH] hw_x86_64: Add virt_base argument to Idt::load

The argument specifies the virtual base address of the mode transition
pages.
---
 repos/base-hw/src/core/include/spec/x86/cpu.h    | 2 +-
 repos/base-hw/src/core/include/spec/x86_64/idt.h | 4 +++-
 repos/base-hw/src/core/spec/x86_64/idt.cc        | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/repos/base-hw/src/core/include/spec/x86/cpu.h b/repos/base-hw/src/core/include/spec/x86/cpu.h
index 7315262a56..2d3a89f31e 100644
--- a/repos/base-hw/src/core/include/spec/x86/cpu.h
+++ b/repos/base-hw/src/core/include/spec/x86/cpu.h
@@ -54,7 +54,7 @@ class Genode::Cpu
 				Tss::setup();
 			}
 
-			_idt->load();
+			_idt->load(Cpu::exception_entry);
 			Tss::load();
 		}
 
diff --git a/repos/base-hw/src/core/include/spec/x86_64/idt.h b/repos/base-hw/src/core/include/spec/x86_64/idt.h
index 67666a9d85..69b3d90543 100644
--- a/repos/base-hw/src/core/include/spec/x86_64/idt.h
+++ b/repos/base-hw/src/core/include/spec/x86_64/idt.h
@@ -54,8 +54,10 @@ class Genode::Idt
 
 		/**
 		 * Load IDT into IDTR.
+		 *
+		 * \param virt_base  virtual base address of mode transition pages
 		 */
-		void load();
+		void load(addr_t const virt_base);
 };
 
 #endif /* _IDT_H_ */
diff --git a/repos/base-hw/src/core/spec/x86_64/idt.cc b/repos/base-hw/src/core/spec/x86_64/idt.cc
index a14b1d82f2..a4a7e6e7fa 100644
--- a/repos/base-hw/src/core/spec/x86_64/idt.cc
+++ b/repos/base-hw/src/core/spec/x86_64/idt.cc
@@ -44,7 +44,7 @@ void Idt::setup()
 }
 
 
-void Idt::load()
+void Idt::load(addr_t const virt_base)
 {
 	asm volatile ("lidt %0" : : "m" (Descriptor (sizeof(_table) - 1,
 				  reinterpret_cast<uint64_t>(_table))));