diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-01-14 20:09:49 +0100 |
| commit | 42a9fa9957e369240936891c9a521ab671eed4e7 (patch) | |
| tree | 7a9367594a367085c6a4a4433f687ec5c8dac8b7 /arch/blackfin/mach-common/entry.S | |
| parent | spi: Enable SPI driver for S5P6440 and S5P6450 (diff) | |
| parent | mmc: sdhci-of: fix build on non-powerpc platforms (diff) | |
| download | linux-42a9fa9957e369240936891c9a521ab671eed4e7.tar.xz linux-42a9fa9957e369240936891c9a521ab671eed4e7.zip | |
Merge branch 'devicetree/next' into spi/next
Diffstat (limited to 'arch/blackfin/mach-common/entry.S')
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index 2ca915ee181f..bc08c98d008d 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: |