diff options
author | Ingo Molnar <mingo@kernel.org> | 2016-03-17 04:44:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2016-03-17 04:44:57 -0400 |
commit | 00f526850151e91fdad0896a1436341687ad2582 (patch) | |
tree | 67c28260020440ade83d6f4aa003ae4f0c683e67 /arch/x86/lib | |
parent | cbf8b5a2b649a501758291cb4d4ba1e5711771ba (diff) | |
parent | d89abe2a1f0c92499eedc815e4a9b2881f4959a5 (diff) |
Merge branch 'x86/cleanups' into x86/urgent
Pull in some merge window leftovers.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r-- | arch/x86/lib/memset_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/memset_64.S b/arch/x86/lib/memset_64.S index c9c81227ea37..e1229ecd2a82 100644 --- a/arch/x86/lib/memset_64.S +++ b/arch/x86/lib/memset_64.S | |||
@@ -9,7 +9,7 @@ | |||
9 | /* | 9 | /* |
10 | * ISO C memset - set a memory block to a byte value. This function uses fast | 10 | * ISO C memset - set a memory block to a byte value. This function uses fast |
11 | * string to get better performance than the original function. The code is | 11 | * string to get better performance than the original function. The code is |
12 | * simpler and shorter than the orignal function as well. | 12 | * simpler and shorter than the original function as well. |
13 | * | 13 | * |
14 | * rdi destination | 14 | * rdi destination |
15 | * rsi value (char) | 15 | * rsi value (char) |