diff options
| author | Mark Brown <broonie@kernel.org> | 2015-09-04 17:16:39 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-09-04 17:16:39 +0100 |
| commit | 04782ca20a8ebb5acf0c35756a38964ae5ea7321 (patch) | |
| tree | ebf475793bb17444d3a1e21974617f27e8ff3a4b /arch/arm/lib/memset.S | |
| parent | d5b98eb12420ce856caaf57dc5256eedc56a3747 (diff) | |
| parent | 17649c90ff4c5246bb4babf6260029968a6d119d (diff) | |
Merge branch 'topic/smbus-block' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap into regmap-core
Diffstat (limited to 'arch/arm/lib/memset.S')
| -rw-r--r-- | arch/arm/lib/memset.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/lib/memset.S b/arch/arm/lib/memset.S index a4ee97b5a2bf..3c65e3bd790f 100644 --- a/arch/arm/lib/memset.S +++ b/arch/arm/lib/memset.S @@ -16,6 +16,7 @@ .text .align 5 +ENTRY(mmioset) ENTRY(memset) UNWIND( .fnstart ) ands r3, r0, #3 @ 1 unaligned? @@ -133,3 +134,4 @@ UNWIND( .fnstart ) b 1b UNWIND( .fnend ) ENDPROC(memset) +ENDPROC(mmioset) |