[tyndur-devel] [PATCH] kernel2: mmc_activate statt cpu_set_context

[Andreas Freimuth <m.nemo@xxxxxxx>]

* mmc_activate(amd64): ersetzt cpu_sec_context
  so heißt das auch unter (i386)

Signed-off-by: Andreas Freimuth <m.nemo@xxxxxxx>
---
 src/kernel2/include/arch/amd64/cpu.h    |    1 -
 src/kernel2/src/arch/amd64/mm/mm_virt.c |    4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/kernel2/include/arch/amd64/cpu.h b/src/kernel2/include/arch/amd64/cpu.h
index b5214c4..f4ab11e 100644
--- a/src/kernel2/include/arch/amd64/cpu.h
+++ b/src/kernel2/include/arch/amd64/cpu.h
@@ -105,7 +105,6 @@ void cpu_write_msr(uint32_t msr, uint64_t value);
 uint64_t cpu_read_msr(uint32_t reg);
 
 mmc_context_t cpu_get_context();
-void cpu_set_context(mmc_context_t context);
 
 /*
  * Aktiviert die I/O-Bitmap fuer den Prozess
diff --git a/src/kernel2/src/arch/amd64/mm/mm_virt.c b/src/kernel2/src/arch/amd64/mm/mm_virt.c
index e5ff28d..8f5af47 100644
--- a/src/kernel2/src/arch/amd64/mm/mm_virt.c
+++ b/src/kernel2/src/arch/amd64/mm/mm_virt.c
@@ -103,9 +103,9 @@ void vmm_init_local(mmc_context_t* context)
     if (mmc_use_no_exec == true) {
         cpu_write_msr(0xC0000080, cpu_read_msr(0xC0000080) | (1 << 11));
     }
-    
+
     // Kontext aktivieren
-    cpu_set_context(context);
+    mmc_activate(context);
 }
 
 /**
-- 
1.7.4.4