Re: [PATCH v2 1/7] x86/paravirt: Make read_cr2() CALLEE_SAVE

[Steven Rostedt]

On Thu, 04 Jul 2019 21:55:56 +0200
Peter Zijlstra <pet...@infradead.org> wrote:

> --- a/arch/x86/xen/xen-asm.S
> +++ b/arch/x86/xen/xen-asm.S
> @@ -10,6 +10,7 @@
>  #include <asm/percpu.h>
>  #include <asm/processor-flags.h>
>  #include <asm/frame.h>
> +#include <asm/asm.h>
>  
>  #include <linux/linkage.h>
>  
> @@ -135,3 +136,19 @@ ENTRY(check_events)
>       FRAME_END
>       ret
>  ENDPROC(check_events)
> +
> +ENTRY(xen_read_cr2)
> +     FRAME_BEGIN
> +     _ASM_MOV PER_CPU_VAR(xen_vcpu), %_ASM_AX
> +     _ASM_MOV XEN_vcpu_info_arch_cr2(%_ASM_AX), %_ASM_AX
> +     FRAME_END
> +     ret
> +     ENDPROC(xen_read_cr2);
> +
> +ENTRY(xen_read_cr2_direct)
> +     FRAME_BEGIN
> +     _ASM_MOV PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_arch_cr2, %_ASM_AX
> +     FRAME_END
> +     ret
> +     ENDPROC(xen_read_cr2_direct);
> +

When I applied this locally, git complained about this extra line at the
end of the file.

-- Steve