summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-03-27 20:43:09 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2022-03-27 20:43:09 +0200
commit88b3be5c6391a5b4be1dcdc4bb8dca8438105438 (patch)
tree5078431068e528b66211591e08757c4b9ea324d4 /arch
parentMerge tag 'x86_core_for_5.18_rc1' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentopenrisc/boot: Remove unnecessary initialisation in memcpy(). (diff)
downloadlinux-88b3be5c6391a5b4be1dcdc4bb8dca8438105438.tar.xz
linux-88b3be5c6391a5b4be1dcdc4bb8dca8438105438.zip
Merge tag 'for-linus' of https://github.com/openrisc/linux
Pull OpenRISC updates from Stafford Horne: "Not much for OpenRISC this merge window, I do have some things on the back burner like sparse warning cleanups and new defconfigs. But I didn't get time to polish the patches off for this round. There are OpenRISC updates coming in via other queues like removal of set_fs() and possibly new generic ticket locks. This just has a small fixup to remove duplicate initializer in memcpy from Kuniyuki Iwashima" * tag 'for-linus' of https://github.com/openrisc/linux: openrisc/boot: Remove unnecessary initialisation in memcpy().
Diffstat (limited to 'arch')
-rw-r--r--arch/openrisc/lib/memcpy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/openrisc/lib/memcpy.c b/arch/openrisc/lib/memcpy.c
index fe2177628fd9..e2af9b510804 100644
--- a/arch/openrisc/lib/memcpy.c
+++ b/arch/openrisc/lib/memcpy.c
@@ -101,7 +101,7 @@ void *memcpy(void *dest, __const void *src, __kernel_size_t n)
*/
void *memcpy(void *dest, __const void *src, __kernel_size_t n)
{
- unsigned char *d = (unsigned char *)dest, *s = (unsigned char *)src;
+ unsigned char *d, *s;
uint32_t *dest_w = (uint32_t *)dest, *src_w = (uint32_t *)src;
/* If both source and dest are word aligned copy words */