diff options
| author | Linus Torvalds | 2022-03-27 11:43:09 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2022-03-27 11:43:09 -0700 |
| commit | 88b3be5c6391a5b4be1dcdc4bb8dca8438105438 (patch) | |
| tree | 5078431068e528b66211591e08757c4b9ea324d4 | |
| parent | 7001052160d172f6de06adeffde24dde9935ece8 (diff) | |
| parent | 862cf8d5fd98ed8ea8989726ed5da53761a9ed76 (diff) | |
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().
| -rw-r--r-- | arch/openrisc/lib/memcpy.c | 2 |
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 */ |