[CRIU] [PATCH 18/20] ARM: fixed compilation error in the file arch/arm/arch_parasite.h when the switch -O2 is turned on.

[Pavel Emelyanov]

On 12/12/2012 05:34 PM, alekskartashov at parallels.com wrote:
> From: Alexander Kartashov <alekskartashov at parallels.com>

This is file added by you. Plz, write it w/o errors from the very beginning,
i.e. don't set patch#N with error and patch#M fixing it.

> 
> Signed-off-by: Alexander Kartashov <alekskartashov at parallels.com>
> ---
>  arch/arm/arch_parasite.h |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/arch_parasite.h b/arch/arm/arch_parasite.h
> index 97165bf..0d3d316 100644
> --- a/arch/arm/arch_parasite.h
> +++ b/arch/arm/arch_parasite.h
> @@ -5,18 +5,18 @@ static uint32_t get_tls(void) {
>  	uint32_t res;
>  
>  	asm (
> -	     "adr %%r1, kuser_get_tls   \n"
> +	     "adr %%r1, 1f              \n"
>  	     "ldr %%r1, [%%r1]          \n"
>  	     "push { %%r7, %%lr }       \n"
>  	     "blx %%r1                  \n"
>  	     "pop { %%r7, %%lr }        \n"
>  	     "mov %0, %%r0              \n"
> -	     "b   core_store_tls_done   \n"
> +	     "b   2f                    \n"
>  
> -	     "kuser_get_tls:            \n"
> +	     "1:                        \n"
>  	     ".word 0xffff0fe0          \n"
>  
> -	     "core_store_tls_done:      \n"
> +	     "2:                        \n"
>  	     :"=r"(res)
>  	     :
>  	     : "r0", "r1", "memory"
>