summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2012-01-02 11:49:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2012-01-02 13:07:08 +0100
commitb936cd4d687704770d33bfc6915c9506bf2fc46d (patch)
treebf92720ee573450441bc9750ec29f8b3493fb23d
parent28f0de6e5f4929fbe5a8b7b6ff5746e4df77dde5 (diff)
downloadbarebox-b936cd4d687704770d33bfc6915c9506bf2fc46d.tar.gz
barebox-b936cd4d687704770d33bfc6915c9506bf2fc46d.tar.xz
ARM: mark 'lr' as clobbered by inline assembler
When executing 'bl' in inline assembler, the 'lr' register must be marked as clobbered too. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--arch/arm/cpu/cpu.c2
-rw-r--r--arch/arm/cpu/mmu.c6
-rw-r--r--arch/arm/cpu/start.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/cpu/cpu.c b/arch/arm/cpu/cpu.c
index d4a3b14819..fc98844f8c 100644
--- a/arch/arm/cpu/cpu.c
+++ b/arch/arm/cpu/cpu.c
@@ -85,7 +85,7 @@ void arch_shutdown(void)
"bl __mmu_cache_off;"
:
:
- : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory"
+ : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
#endif
}
diff --git a/arch/arm/cpu/mmu.c b/arch/arm/cpu/mmu.c
index 8e4e81aa9c..29e12b7a7c 100644
--- a/arch/arm/cpu/mmu.c
+++ b/arch/arm/cpu/mmu.c
@@ -24,7 +24,7 @@ static void create_sections(unsigned long virt, unsigned long phys, int size_m,
"bl __mmu_cache_flush;"
:
:
- : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory"
+ : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
}
@@ -244,7 +244,7 @@ static int mmu_init(void)
"bl __mmu_cache_on;"
:
:
- : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory"
+ : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
/*
@@ -274,7 +274,7 @@ void mmu_disable(void)
"bl __mmu_cache_off;"
:
:
- : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory"
+ : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
}
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 5e09300062..dc1f5a8cd3 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -78,7 +78,7 @@ void __naked __bare_init reset(void)
"bl __mmu_cache_flush;"
:
:
- : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "cc", "memory"
+ : "r0", "r1", "r2", "r3", "r6", "r10", "r12", "lr", "cc", "memory"
);
/* disable MMU stuff and caches */