diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-27 20:20:15 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-03-27 20:20:15 -0700 |
| commit | acb4f33713b9f6cadb6143f211714c343465411c (patch) | |
| tree | b4eb05444e0711e3be671176d5e691f0c1f91bc6 | |
| parent | Merge tag 'powerpc-6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux (diff) | |
| parent | m68k: mm: Replace deprecated strncpy() with strscpy() (diff) | |
| download | wireguard-linux-acb4f33713b9f6cadb6143f211714c343465411c.tar.xz wireguard-linux-acb4f33713b9f6cadb6143f211714c343465411c.zip | |
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>
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 3 | ||||
| -rw-r--r-- | arch/m68k/kernel/setup_no.c | 1 | ||||
| -rw-r--r-- | arch/m68k/kernel/uboot.c | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index 3bc28bc512ac..0fba32552836 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -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; diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index c926da9d5ec2..f9872098f5ca 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c @@ -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> diff --git a/arch/m68k/kernel/uboot.c b/arch/m68k/kernel/uboot.c index 8bb1cb3a7490..5e52ea150d5c 100644 --- a/arch/m68k/kernel/uboot.c +++ b/arch/m68k/kernel/uboot.c @@ -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> |