diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-09 16:36:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-09 16:36:10 -0800 |
| commit | f4d68930a88219ffda60f137dcc858e4f5db6680 (patch) | |
| tree | 024c8ae8d288a858b6b1c58ae8c1ef7dcfa481f8 /arch/nios2/lib | |
| parent | 3510ca19a82ba4c6a17af79c1f0448622a406efa (diff) | |
| parent | bb3fc5ddef93836a36a39308cf7eca82ef0a1c4c (diff) | |
Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2
Pull nios2 updates from Ley Foon Tan:
- nios2: Remove unnecessary #ifdef guards
- nios2: Switch to generic __xchg()
- nios2: Fix unused variable warning
* tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
nios2: Remove unnecessary #ifdef guards
nios2: Switch to generic __xchg()
nios2: Fix unused variable warning
Diffstat (limited to 'arch/nios2/lib')
| -rw-r--r-- | arch/nios2/lib/memmove.c | 2 | ||||
| -rw-r--r-- | arch/nios2/lib/memset.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/nios2/lib/memmove.c b/arch/nios2/lib/memmove.c index c65ef517eb80..866c021f278c 100644 --- a/arch/nios2/lib/memmove.c +++ b/arch/nios2/lib/memmove.c @@ -10,7 +10,6 @@ #include <linux/types.h> #include <linux/string.h> -#ifdef __HAVE_ARCH_MEMMOVE void *memmove(void *d, const void *s, size_t count) { unsigned long dst, src; @@ -79,4 +78,3 @@ restdown: return d; } -#endif /* __HAVE_ARCH_MEMMOVE */ diff --git a/arch/nios2/lib/memset.c b/arch/nios2/lib/memset.c index 65e97802f5cc..c2cfcb121e34 100644 --- a/arch/nios2/lib/memset.c +++ b/arch/nios2/lib/memset.c @@ -10,7 +10,6 @@ #include <linux/types.h> #include <linux/string.h> -#ifdef __HAVE_ARCH_MEMSET void *memset(void *s, int c, size_t count) { int destptr, charcnt, dwordcnt, fill8reg, wrkrega; @@ -78,4 +77,3 @@ void *memset(void *s, int c, size_t count) return s; } -#endif /* __HAVE_ARCH_MEMSET */ |