diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2015-11-06 07:19:11 +0100 |
|---|---|---|
| committer | Ley Foon Tan <lftan@altera.com> | 2015-11-09 03:33:30 +0100 |
| commit | bb3fc5ddef93836a36a39308cf7eca82ef0a1c4c (patch) | |
| tree | b1120a5bcd13d677c635918c2b52814f33f1ac94 /arch | |
| parent | nios2: Switch to generic __xchg() (diff) | |
| download | linux-bb3fc5ddef93836a36a39308cf7eca82ef0a1c4c.tar.xz linux-bb3fc5ddef93836a36a39308cf7eca82ef0a1c4c.zip | |
nios2: Remove unnecessary #ifdef guards
__HAVE_ARCH_MEMMOVE and __HAVE_ARCH_MEMSET are unconditionally defined
for nios2, so there is no need to protect the function definitions of
memmove() and memset().
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
Acked-by: Ley Foon Tan <lftan@altera.com>
Diffstat (limited to '')
| -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 */ |