Commit acb4f337 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'm68knommu-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 

Pull m68knommu updates from Greg Ungerer:

 - remove unused include of linux/fb.h

 - use strscpy() instead of strncpy()

* tag 'm68knommu-for-v6.15' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: mm: Replace deprecated strncpy() with strscpy()
  m68k: Do not include <linux/fb.h>
parents 7b667acd a7130910

arch/m68k/kernel/setup_mm.c

+1 −2
Original line number Diff line number Diff line
@@ -242,8 +242,7 @@ void __init setup_arch(char **cmdline_p) 
	setup_initial_init_mm((void *)PAGE_OFFSET, _etext, _edata, _end);



#if defined(CONFIG_BOOTPARAM)

	strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);

	m68k_command_line[CL_SIZE - 1] = 0;

	strscpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);

#endif /* CONFIG_BOOTPARAM */

	process_uboot_commandline(&m68k_command_line[0], CL_SIZE);

	*cmdline_p = m68k_command_line;

arch/m68k/kernel/setup_no.c

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/sched.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/fb.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/console.h>

arch/m68k/kernel/uboot.c

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <linux/sched.h>

#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/fb.h>

#include <linux/module.h>

#include <linux/mm.h>

#include <linux/console.h>