summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-11-14 00:02:53 +0000
committerMike Frysinger <vapier@gentoo.org>2011-01-10 07:18:21 -0500
commit503f3d30c6f29c58fce77bfe47b04e3c667e7640 (patch)
tree1f9a69b228cbd0b5682671fc1149387303c6aacd /arch
parent064cc44e62283227524c8e84ff247939728dec79 (diff)
downloadlinux-3.10-503f3d30c6f29c58fce77bfe47b04e3c667e7640.tar.gz
linux-3.10-503f3d30c6f29c58fce77bfe47b04e3c667e7640.tar.bz2
linux-3.10-503f3d30c6f29c58fce77bfe47b04e3c667e7640.zip
Blackfin: fix building IPIPE code when XIP is enabled
The low level assembly needs to use the pseudo_long_call helper so that we use the right call insn when doing kernel XIP. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/mach-common/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S
index 2ca915ee181..bc08c98d008 100644
--- a/arch/blackfin/mach-common/entry.S
+++ b/arch/blackfin/mach-common/entry.S
@@ -615,7 +615,7 @@ ENTRY(_system_call)
#ifdef CONFIG_IPIPE
r0 = sp;
SP += -12;
- call ___ipipe_syscall_root;
+ pseudo_long_call ___ipipe_syscall_root, p0;
SP += 12;
cc = r0 == 1;
if cc jump .Lsyscall_really_exit;
@@ -692,7 +692,7 @@ ENTRY(_system_call)
[--sp] = reti;
SP += 4; /* don't merge with next insn to keep the pattern obvious */
SP += -12;
- call ___ipipe_sync_root;
+ pseudo_long_call ___ipipe_sync_root, p4;
SP += 12;
jump .Lresume_userspace_1;
.Lsyscall_no_irqsync: