diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-06-08 02:24:07 -0400 |
| commit | a292241cccb7e20e8b997a9a44177e7c98141859 (patch) | |
| tree | a0b0bb95e7dce3233a2d8b203f9e326cdec7a00e /lib/string.c | |
| parent | d49cb7aeebb974713f9f7ab2991352d3050b095b (diff) | |
| parent | 68807a0c2015cb40df4869e16651f0ce5cc14d52 (diff) | |
Merge branch 'next' into for-linus
Prepare input updates for 3.16.
Diffstat (limited to 'lib/string.c')
| -rw-r--r-- | lib/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/string.c b/lib/string.c index e5878de4f101..9b1f9062a202 100644 --- a/lib/string.c +++ b/lib/string.c | |||
| @@ -648,7 +648,7 @@ EXPORT_SYMBOL(memmove); | |||
| 648 | * @count: The size of the area. | 648 | * @count: The size of the area. |
| 649 | */ | 649 | */ |
| 650 | #undef memcmp | 650 | #undef memcmp |
| 651 | int memcmp(const void *cs, const void *ct, size_t count) | 651 | __visible int memcmp(const void *cs, const void *ct, size_t count) |
| 652 | { | 652 | { |
| 653 | const unsigned char *su1, *su2; | 653 | const unsigned char *su1, *su2; |
| 654 | int res = 0; | 654 | int res = 0; |