diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 17:51:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 17:51:34 -0700 |
| commit | 3573d3869de475cca9f2d4998fc3c2871a4cc2db (patch) | |
| tree | 5b556cd8abcef8014f5ea4b9e95835ba4badc40a /arch/arc/lib/strlen.S | |
| parent | c8d9762affa0a97e299be2cabfec861515ef1580 (diff) | |
| parent | 61fb4bfc010b0d2940f7fd87acbce6a0f03217cb (diff) | |
| download | blackbird-op-linux-3573d3869de475cca9f2d4998fc3c2871a4cc2db.tar.gz blackbird-op-linux-3573d3869de475cca9f2d4998fc3c2871a4cc2db.zip | |
Merge tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC changes from Vineet Gupta:
- Support for external initrd from Noam
- Fix broken serial console in nsimosci Virtual Platform
- Reuse of ENTRY/END assembler macros across hand asm code
- Other minor fixes here and there
* tag 'arc-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: [nsimosci] Unbork console
ARC: [nsimosci] Change .dts to use generic 8250 UART
ARC: [SMP] General Fixes
ARC: Remove unused DT template file
ARC: [clockevent] simplify timer ISR
ARC: [clockevent] can't be SoC specific
ARC: Remove ARC_HAS_COH_RTSC
ARC: switch to generic ENTRY/END assembler annotations
ARC: support external initrd
ARC: add uImage to .gitignore
ARC: [arcfpga] Fix __initconst data const-correctness
Diffstat (limited to 'arch/arc/lib/strlen.S')
| -rw-r--r-- | arch/arc/lib/strlen.S | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arc/lib/strlen.S b/arch/arc/lib/strlen.S index 39759e099696..53cfd5685a5f 100644 --- a/arch/arc/lib/strlen.S +++ b/arch/arc/lib/strlen.S @@ -6,9 +6,9 @@ * published by the Free Software Foundation. */ -#include <asm/linkage.h> +#include <linux/linkage.h> -ARC_ENTRY strlen +ENTRY(strlen) or r3,r0,7 ld r2,[r3,-7] ld.a r6,[r3,-3] @@ -80,4 +80,4 @@ ARC_ENTRY strlen .Learly_end: b.d .Lend sub_s.ne r1,r1,r1 -ARC_EXIT strlen +END(strlen) |
