diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-31 00:14:26 -0400 |
| commit | d5b732b17ca2fc74f370bdba5aae6c804fac8c35 (patch) | |
| tree | 4facc6d96116b032a3c1cb2ced9b2a3008e9216e /arch/blackfin/lib/memset.S | |
| parent | eb6e8605ee5f5b4e116451bf01b3f35eac446dde (diff) | |
| parent | 67a3e12b05e055c0415c556a315a3d3eb637e29e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/blackfin/lib/memset.S')
| -rw-r--r-- | arch/blackfin/lib/memset.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/lib/memset.S b/arch/blackfin/lib/memset.S index c30d99b10969..eab1bef3f5bf 100644 --- a/arch/blackfin/lib/memset.S +++ b/arch/blackfin/lib/memset.S | |||
| @@ -20,6 +20,7 @@ | |||
| 20 | * R1 = filler byte | 20 | * R1 = filler byte |
| 21 | * R2 = count | 21 | * R2 = count |
| 22 | * Favours word aligned data. | 22 | * Favours word aligned data. |
| 23 | * The strncpy assumes that I0 and I1 are not used in this function | ||
| 23 | */ | 24 | */ |
| 24 | 25 | ||
| 25 | ENTRY(_memset) | 26 | ENTRY(_memset) |