diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 07:35:09 -0700 |
| commit | 0c9e98af5e94877ad3b1af2c0f39b2376a462ded (patch) | |
| tree | acbab68f802fadbff85590c139c87dc199bb465d /arch/m68k/lib/memset.c | |
| parent | af0c25c4876305dfa1a25ac1cc92d3cddfa476a6 (diff) | |
| parent | fe0d42203cb5616eeff68b14576a0f7e2dd56625 (diff) | |
Merge Linux 3.0-rc6 into staging-next
This handles the merge conflicts with the
drivers/staging/brcm80211/Kconfig file due to changes on the two
different branches.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/m68k/lib/memset.c')
| -rw-r--r-- | arch/m68k/lib/memset.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/arch/m68k/lib/memset.c b/arch/m68k/lib/memset.c index f649e6a2e644..8a7639f0a2fe 100644 --- a/arch/m68k/lib/memset.c +++ b/arch/m68k/lib/memset.c @@ -32,8 +32,10 @@ void *memset(void *s, int c, size_t count) temp = count >> 2; if (temp) { long *ls = s; -#if defined(__mc68020__) || defined(__mc68030__) || \ - defined(__mc68040__) || defined(__mc68060__) || defined(__mcpu32__) +#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) + for (; temp; temp--) + *ls++ = c; +#else size_t temp1; asm volatile ( " movel %1,%2\n" @@ -55,9 +57,6 @@ void *memset(void *s, int c, size_t count) " jpl 1b" : "=a" (ls), "=d" (temp), "=&d" (temp1) : "d" (c), "0" (ls), "1" (temp)); -#else - for (; temp; temp--) - *ls++ = c; #endif s = ls; } |