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

alekskartashov at parallels.com alekskartashov at parallels.com
Wed Dec 12 08:34:28 EST 2012


From: Alexander Kartashov <alekskartashov at parallels.com>


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"
-- 
1.7.9.5



More information about the CRIU mailing list