diff --git a/[refs] b/[refs] index d4ae60e5513e..facfd3557de8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e47d3e6c35bb5b78fea2b2584c7eeaf782f138d +refs/heads/master: 4a8c4c4e10d1bc2c3bd80caabb6a76a66849f7e8 diff --git a/trunk/include/asm-x86/paravirt.h b/trunk/include/asm-x86/paravirt.h index 0735a90f531b..7d1c126e2249 100644 --- a/trunk/include/asm-x86/paravirt.h +++ b/trunk/include/asm-x86/paravirt.h @@ -1227,6 +1227,12 @@ static inline unsigned long __raw_local_irq_save(void) push %ecx; push %edx; \ call *pv_cpu_ops+PV_CPU_read_cr0; \ pop %edx; pop %ecx +#else +#define GET_CR2_INTO_RCX \ + call *pv_mmu_ops+PV_MMU_read_cr2; \ + movq %rax, %rcx; \ + xorq %rax, %rax; + #endif #endif /* __ASSEMBLY__ */