Loading arch/parisc/kernel/setup.c +12 −14 Original line number Original line Diff line number Diff line Loading @@ -50,13 +50,13 @@ void __init setup_cmdline(char **cmdline_p) extern unsigned int boot_args[]; extern unsigned int boot_args[]; char *p; char *p; /* Collect stuff passed in from the boot loader */ *cmdline_p = command_line; /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ if (boot_args[0] < 64) { if (boot_args[0] < 64) /* called from hpux boot loader */ return; /* return if called from hpux boot loader */ boot_command_line[0] = '\0'; } else { /* Collect stuff passed in from the boot loader */ strscpy(boot_command_line, (char *)__va(boot_args[1]), strscpy(boot_command_line, (char *)__va(boot_args[1]), COMMAND_LINE_SIZE); COMMAND_LINE_SIZE); Loading @@ -75,16 +75,14 @@ void __init setup_cmdline(char **cmdline_p) strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE); strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE); #ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ /* did palo pass us a ramdisk? */ { if (boot_args[2] != 0) { initrd_start = (unsigned long)__va(boot_args[2]); initrd_start = (unsigned long)__va(boot_args[2]); initrd_end = (unsigned long)__va(boot_args[3]); initrd_end = (unsigned long)__va(boot_args[3]); } } #endif #endif } strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; } } #ifdef CONFIG_PA11 #ifdef CONFIG_PA11 Loading Loading
arch/parisc/kernel/setup.c +12 −14 Original line number Original line Diff line number Diff line Loading @@ -50,13 +50,13 @@ void __init setup_cmdline(char **cmdline_p) extern unsigned int boot_args[]; extern unsigned int boot_args[]; char *p; char *p; /* Collect stuff passed in from the boot loader */ *cmdline_p = command_line; /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ /* boot_args[0] is free-mem start, boot_args[1] is ptr to command line */ if (boot_args[0] < 64) { if (boot_args[0] < 64) /* called from hpux boot loader */ return; /* return if called from hpux boot loader */ boot_command_line[0] = '\0'; } else { /* Collect stuff passed in from the boot loader */ strscpy(boot_command_line, (char *)__va(boot_args[1]), strscpy(boot_command_line, (char *)__va(boot_args[1]), COMMAND_LINE_SIZE); COMMAND_LINE_SIZE); Loading @@ -75,16 +75,14 @@ void __init setup_cmdline(char **cmdline_p) strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE); strlcat(p, " earlycon=pdc", COMMAND_LINE_SIZE); #ifdef CONFIG_BLK_DEV_INITRD #ifdef CONFIG_BLK_DEV_INITRD if (boot_args[2] != 0) /* did palo pass us a ramdisk? */ /* did palo pass us a ramdisk? */ { if (boot_args[2] != 0) { initrd_start = (unsigned long)__va(boot_args[2]); initrd_start = (unsigned long)__va(boot_args[2]); initrd_end = (unsigned long)__va(boot_args[3]); initrd_end = (unsigned long)__va(boot_args[3]); } } #endif #endif } strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); strscpy(command_line, boot_command_line, COMMAND_LINE_SIZE); *cmdline_p = command_line; } } #ifdef CONFIG_PA11 #ifdef CONFIG_PA11 Loading