Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'm68knommu-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu
Pull m68knommu updates from Greg Ungerer:
- defconfig cleanup
- fix for legacy 68000 CPU memmove() of non-aligned pointers
- replace strcpy() with strscpy() for ucsimm target
* tag 'm68knommu-for-v7.0' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
m68knommu: Replace deprecated strcpy with strscpy in init_ucsimm
m68k: nommu: fix memmove() with differently aligned src and dest for 68000
m68k: defconfig: Clean up references to non-existing configs
+20
-5
+2
-1
arch/m68k/68000/ucsimm.c
+2
-1
arch/m68k/68000/ucsimm.c
···
9
9
* for more details.
10
10
*/
11
11
#include <linux/init.h>
12
+
#include <linux/string.h>
12
13
#include <asm/bootstd.h>
13
14
#include <asm/machdep.h>
14
15
#include <asm/MC68VZ328.h>
···
32
31
pr_info("uCsimm/uCdimm hwaddr %pM\n", p);
33
32
p = getbenv("APPEND");
34
33
if (p)
35
-
strcpy(p, command);
34
+
strscpy(p, command, size);
36
35
else
37
36
command[0] = 0;
38
37
}
-2
arch/m68k/configs/amcore_defconfig
-2
arch/m68k/configs/amcore_defconfig
···
61
61
CONFIG_SERIAL_MCF_CONSOLE=y
62
62
# CONFIG_HW_RANDOM is not set
63
63
CONFIG_I2C=y
64
-
# CONFIG_I2C_COMPAT is not set
65
64
CONFIG_I2C_CHARDEV=y
66
65
# CONFIG_I2C_HELPER_AUTO is not set
67
66
CONFIG_I2C_IMX=y
···
82
83
CONFIG_PRINTK_TIME=y
83
84
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
84
85
CONFIG_PANIC_ON_OOPS=y
85
-
# CONFIG_SCHED_DEBUG is not set
86
86
# CONFIG_DEBUG_BUGVERBOSE is not set
87
87
# CONFIG_CRYPTO_ECHAINIV is not set
88
88
# CONFIG_CRYPTO_HW is not set
-1
arch/m68k/configs/m5475evb_defconfig
-1
arch/m68k/configs/m5475evb_defconfig
-1
arch/m68k/configs/stmark2_defconfig
-1
arch/m68k/configs/stmark2_defconfig
+18
arch/m68k/lib/memmove.c
+18
arch/m68k/lib/memmove.c
···
24
24
src = csrc;
25
25
n--;
26
26
}
27
+
#if defined(CONFIG_M68000)
28
+
if ((long)src & 1) {
29
+
char *cdest = dest;
30
+
const char *csrc = src;
31
+
for (; n; n--)
32
+
*cdest++ = *csrc++;
33
+
return xdest;
34
+
}
35
+
#endif
27
36
if (n > 2 && (long)dest & 2) {
28
37
short *sdest = dest;
29
38
const short *ssrc = src;
···
75
66
src = csrc;
76
67
n--;
77
68
}
69
+
#if defined(CONFIG_M68000)
70
+
if ((long)src & 1) {
71
+
char *cdest = dest;
72
+
const char *csrc = src;
73
+
for (; n; n--)
74
+
*--cdest = *--csrc;
75
+
return xdest;
76
+
}
77
+
#endif
78
78
if (n > 2 && (long)dest & 2) {
79
79
short *sdest = dest;
80
80
const short *ssrc = src;