Skip to content

Commit 88b3be5

Browse files
committed
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().
2 parents 7001052 + 862cf8d commit 88b3be5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/openrisc/lib/memcpy.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void *memcpy(void *dest, __const void *src, __kernel_size_t n)
101101
*/
102102
void *memcpy(void *dest, __const void *src, __kernel_size_t n)
103103
{
104-
unsigned char *d = (unsigned char *)dest, *s = (unsigned char *)src;
104+
unsigned char *d, *s;
105105
uint32_t *dest_w = (uint32_t *)dest, *src_w = (uint32_t *)src;
106106

107107
/* If both source and dest are word aligned copy words */

0 commit comments

Comments
 (0)