66d857b08b
There is a lot of common code that could be shared between the m68k and m68knommu arch branches. It makes sense to merge the two branches into a single directory structure so that we can more easily share that common code. This is a brute force merge, based on a script from Stephen King <sfking@fdwdc.com>, which was originally written by Arnd Bergmann <arnd@arndb.de>. > The script was inspired by the script Sam Ravnborg used to merge the > includes from m68knommu. For those files common to both arches but > differing in content, the m68k version of the file is renamed to > <file>_mm.<ext> and the m68knommu version of the file is moved into the > corresponding m68k directory and renamed <file>_no.<ext> and a small > wrapper file <file>.<ext> is used to select between the two version. Files > that are common to both but don't differ are removed from the m68knommu > tree and files and directories that are unique to the m68knommu tree are > moved to the m68k tree. Finally, the arch/m68knommu tree is removed. > > To select between the the versions of the files, the wrapper uses > > #ifdef CONFIG_MMU > #include <file>_mm.<ext> > #else > #include <file>_no.<ext> > #endif On top of this file merge I have done a simplistic merge of m68k and m68knommu Kconfig, which primarily attempts to keep existing options and menus in place. Other than a handful of options being moved it produces identical .config outputs on m68k and m68knommu targets I tested it on. With this in place there is now quite a bit of scope for merge cleanups in future patches. Signed-off-by: Greg Ungerer <gerg@uclinux.org>
48 lines
669 B
C
48 lines
669 B
C
#include <linux/types.h>
|
|
|
|
void * memset(void * s, int c, size_t count)
|
|
{
|
|
void *xs = s;
|
|
size_t temp;
|
|
|
|
if (!count)
|
|
return xs;
|
|
c &= 0xff;
|
|
c |= c << 8;
|
|
c |= c << 16;
|
|
if ((long) s & 1)
|
|
{
|
|
char *cs = s;
|
|
*cs++ = c;
|
|
s = cs;
|
|
count--;
|
|
}
|
|
if (count > 2 && (long) s & 2)
|
|
{
|
|
short *ss = s;
|
|
*ss++ = c;
|
|
s = ss;
|
|
count -= 2;
|
|
}
|
|
temp = count >> 2;
|
|
if (temp)
|
|
{
|
|
long *ls = s;
|
|
for (; temp; temp--)
|
|
*ls++ = c;
|
|
s = ls;
|
|
}
|
|
if (count & 2)
|
|
{
|
|
short *ss = s;
|
|
*ss++ = c;
|
|
s = ss;
|
|
}
|
|
if (count & 1)
|
|
{
|
|
char *cs = s;
|
|
*cs = c;
|
|
}
|
|
return xs;
|
|
}
|