2 files changed, 12 insertions, 8 deletions

diff --git a/arch/m68k/Kconfig.debug b/arch/m68k/Kconfig.debug
index 2bdb1b01115c..af4fd5f8f8d5 100644
--- a/arch/m68k/Kconfig.debug
+++ b/arch/m68k/Kconfig.debug
@@ -2,6 +2,14 @@ menu "Kernel hacking"
 
 source "lib/Kconfig.debug"
 
+config BOOTPARAM
+        bool 'Compiled-in Kernel Boot Parameter'
+
+config BOOTPARAM_STRING
+        string 'Kernel Boot Parameter'
+        default 'console=ttyS0,19200'
+        depends on BOOTPARAM
+
 if !MMU
 
 config FULLDEBUG
@@ -15,14 +23,6 @@ config HIGHPROFILE
         help
           Use a fast secondary clock to produce profiling information.
 
-config BOOTPARAM
-        bool 'Compiled-in Kernel Boot Parameter'
-
-config BOOTPARAM_STRING
-        string 'Kernel Boot Parameter'
-        default 'console=ttyS0,19200'
-        depends on BOOTPARAM
-
 config NO_KERNEL_MSG
         bool "Suppress Kernel BUG Messages"
         help
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c
index c3b45061dd08..55f8f5049f68 100644
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -258,6 +258,10 @@ void __init setup_arch(char **cmdline_p)
         init_mm.end_data = (unsigned long)_edata;
         init_mm.brk = (unsigned long)_end;
 
+#if defined(CONFIG_BOOTPARAM)
+        strncpy(m68k_command_line, CONFIG_BOOTPARAM_STRING, CL_SIZE);
+        m68k_command_line[CL_SIZE - 1] = 0;
+#endif /* CONFIG_BOOTPARAM */
         *cmdline_p = m68k_command_line;
         memcpy(boot_command_line, *cmdline_p, CL_SIZE);