Commit 0f2acd31 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 26a4cfaf a16ac6ca

arch/m68k/68000/ucsimm.c

+2 −1
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
 * for more details.

 */

#include <linux/init.h>

#include <linux/string.h>

#include <asm/bootstd.h>

#include <asm/machdep.h>

#include <asm/MC68VZ328.h>
@@ -31,7 +32,7 @@ void __init init_ucsimm(char *command, int size) 
	pr_info("uCsimm/uCdimm hwaddr %pM\n", p);

	p = getbenv("APPEND");

	if (p)

		strcpy(p, command);

		strscpy(p, command, size);

	else

		command[0] = 0;

}

arch/m68k/configs/amcore_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ CONFIG_SERIAL_MCF_BAUDRATE=115200 
CONFIG_SERIAL_MCF_CONSOLE=y

# CONFIG_HW_RANDOM is not set

CONFIG_I2C=y

# CONFIG_I2C_COMPAT is not set

CONFIG_I2C_CHARDEV=y

# CONFIG_I2C_HELPER_AUTO is not set

CONFIG_I2C_IMX=y
@@ -83,7 +82,6 @@ CONFIG_ROMFS_BACKED_BY_BOTH=y 
CONFIG_PRINTK_TIME=y

# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

# CONFIG_DEBUG_BUGVERBOSE is not set

# CONFIG_CRYPTO_ECHAINIV is not set

# CONFIG_CRYPTO_HW is not set

arch/m68k/configs/m5475evb_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -46,6 +46,5 @@ CONFIG_EXT2_FS=y 
# CONFIG_PROC_PAGE_MONITOR is not set

CONFIG_ROMFS_FS=y

CONFIG_ROMFS_BACKED_BY_MTD=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_BOOTPARAM=y

CONFIG_BOOTPARAM_STRING="root=/dev/mtdblock0"

arch/m68k/configs/stmark2_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -90,4 +90,3 @@ CONFIG_PRINTK_TIME=y 
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set

CONFIG_SLUB_DEBUG_ON=y

CONFIG_PANIC_ON_OOPS=y
 
# CONFIG_SCHED_DEBUG is not set

arch/m68k/lib/memmove.c

+18 −0
Original line number Diff line number Diff line
@@ -24,6 +24,15 @@ void *memmove(void *dest, const void *src, size_t n) 
			src = csrc;

			n--;

		}

#if defined(CONFIG_M68000)

		if ((long)src & 1) {

			char *cdest = dest;

			const char *csrc = src;

			for (; n; n--)

				*cdest++ = *csrc++;

			return xdest;

		}

#endif

		if (n > 2 && (long)dest & 2) {

			short *sdest = dest;

			const short *ssrc = src;
@@ -66,6 +75,15 @@ void *memmove(void *dest, const void *src, size_t n) 
			src = csrc;

			n--;

		}

#if defined(CONFIG_M68000)

		if ((long)src & 1) {

			char *cdest = dest;

			const char *csrc = src;

			for (; n; n--)

				*--cdest = *--csrc;

			return xdest;

		}

#endif

		if (n > 2 && (long)dest & 2) {

			short *sdest = dest;

			const short *ssrc = src;