Merge branch master from git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

[linux-2.6-block.git] / arch / x86 / entry / calling.h

diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h
index 7ce7ac9d9d3f3386c9b191fcf0b8036dddae05e6..515c0ceeb4a3608bbdd0cb9afad747417e8a7f88 100644 (file)
--- a/arch/x86/entry/calling.h
+++ b/arch/x86/entry/calling.h
@@ -360,3 +360,9 @@ For 32-bit we have the following conventions - kernel is built with
 .Lafter_call_\@:
 #endif
 .endm
+
+#ifdef CONFIG_PARAVIRT_XXL
+#define GET_CR2_INTO(reg) GET_CR2_INTO_AX ; _ASM_MOV %_ASM_AX, reg
+#else
+#define GET_CR2_INTO(reg) _ASM_MOV %cr2, reg
+#endif