|
@@ -19,6 +19,13 @@
|
|
#include <asm/msr.h>
|
|
#include <asm/msr.h>
|
|
#include <asm/cache.h>
|
|
#include <asm/cache.h>
|
|
|
|
|
|
|
|
+#ifdef CONFIG_PARAVIRT
|
|
|
|
+#include <asm/asm-offsets.h>
|
|
|
|
+#include <asm/paravirt.h>
|
|
|
|
+#else
|
|
|
|
+#define GET_CR2_INTO_RCX movq %cr2, %rcx
|
|
|
|
+#endif
|
|
|
|
+
|
|
/* we are not able to switch in one step to the final KERNEL ADRESS SPACE
|
|
/* we are not able to switch in one step to the final KERNEL ADRESS SPACE
|
|
* because we need identity-mapped pages.
|
|
* because we need identity-mapped pages.
|
|
*
|
|
*
|
|
@@ -267,7 +274,7 @@ ENTRY(early_idt_handler)
|
|
xorl %eax,%eax
|
|
xorl %eax,%eax
|
|
movq 8(%rsp),%rsi # get rip
|
|
movq 8(%rsp),%rsi # get rip
|
|
movq (%rsp),%rdx
|
|
movq (%rsp),%rdx
|
|
- movq %cr2,%rcx
|
|
|
|
|
|
+ GET_CR2_INTO_RCX
|
|
leaq early_idt_msg(%rip),%rdi
|
|
leaq early_idt_msg(%rip),%rdi
|
|
call early_printk
|
|
call early_printk
|
|
cmpl $2,early_recursion_flag(%rip)
|
|
cmpl $2,early_recursion_flag(%rip)
|