Skip to content

Commit

Permalink
Merge tag 'for-linus' of https://github.com/openrisc/linux
Browse files Browse the repository at this point in the history
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().
  • Loading branch information
Linus Torvalds committed Mar 27, 2022
2 parents 7001052 + 862cf8d commit 88b3be5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/openrisc/lib/memcpy.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 88b3be5

Please sign in to comment.