mirror of
https://github.com/raspberrypi/linux.git
synced 2026-01-04 18:27:36 +00:00
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>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user