@@ -50,15 +50,15 @@ void __init setup_cmdline(char **cmdline_p)
50
50
extern unsigned int boot_args [];
51
51
char * p ;
52
52
53
- /* Collect stuff passed in from the boot loader */
53
+ * cmdline_p = command_line ;
54
54
55
55
/* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */
56
- if (boot_args [0 ] < 64 ) {
57
- /* called from hpux boot loader */
58
- boot_command_line [ 0 ] = '\0' ;
59
- } else {
60
- strscpy (boot_command_line , (char * )__va (boot_args [1 ]),
61
- COMMAND_LINE_SIZE );
56
+ if (boot_args [0 ] < 64 )
57
+ return ; /* return if called from hpux boot loader */
58
+
59
+ /* Collect stuff passed in from the boot loader */
60
+ strscpy (boot_command_line , (char * )__va (boot_args [1 ]),
61
+ COMMAND_LINE_SIZE );
62
62
63
63
/* autodetect console type (if not done by palo yet) */
64
64
p = boot_command_line ;
@@ -75,16 +75,14 @@ void __init setup_cmdline(char **cmdline_p)
75
75
strlcat (p , " earlycon=pdc" , COMMAND_LINE_SIZE );
76
76
77
77
#ifdef CONFIG_BLK_DEV_INITRD
78
- if (boot_args [2 ] != 0 ) /* did palo pass us a ramdisk? */
79
- {
80
- initrd_start = (unsigned long )__va (boot_args [2 ]);
81
- initrd_end = (unsigned long )__va (boot_args [3 ]);
82
- }
83
- #endif
78
+ /* did palo pass us a ramdisk? */
79
+ if (boot_args [2 ] != 0 ) {
80
+ initrd_start = (unsigned long )__va (boot_args [2 ]);
81
+ initrd_end = (unsigned long )__va (boot_args [3 ]);
84
82
}
83
+ #endif
85
84
86
85
strscpy (command_line , boot_command_line , COMMAND_LINE_SIZE );
87
- * cmdline_p = command_line ;
88
86
}
89
87
90
88
#ifdef CONFIG_PA11
0 commit comments