From 472c3b6502a6cf0bc570d7c83f4eb99cfc516cb7 Mon Sep 17 00:00:00 2001 From: Reto Buerki Date: Fri, 27 Feb 2015 13:26:27 +0100 Subject: [PATCH] hw_x86_64: Use mtc relative addressing for master context --- repos/base-hw/src/core/spec/x86_64/mode_transition.s | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/repos/base-hw/src/core/spec/x86_64/mode_transition.s b/repos/base-hw/src/core/spec/x86_64/mode_transition.s index aeb89e4d7..a10f1c8d5 100644 --- a/repos/base-hw/src/core/spec/x86_64/mode_transition.s +++ b/repos/base-hw/src/core/spec/x86_64/mode_transition.s @@ -34,6 +34,8 @@ /* mtc virt addresses */ .set MT_BUFFER, _mt_buffer - _mt_begin +.set MT_MASTER, _mt_master_context_begin - _mt_begin + .macro _isr_entry .align 4, 0x90 .endm @@ -131,7 +133,7 @@ mov %rax, MT_BUFFER /* Switch to kernel page tables */ - mov _mt_master_context_begin+CR3_OFFSET, %rax + mov MT_MASTER+CR3_OFFSET, %rax mov %rax, %cr3 /* Save information on interrupt stack frame in client context */