Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 47999
b: refs/heads/master
c: 3c253ca
h: refs/heads/master
i:
  47997: bea304d
  47995: cb8ebfe
  47991: 6f6c2b9
  47983: d441655
  47967: b037f3a
  47935: 7536661
  47871: 2b28476
v: v3
  • Loading branch information
Alon Bar-Lev authored and Linus Torvalds committed Feb 12, 2007
1 parent d0a88f1 commit 59ed087
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 30d7e0d466b3ac0b5ef77e4062bf9385f0d72270
refs/heads/master: 3c253ca0f0930b767a5d6ac0c1b3c6f5619e28f9
6 changes: 3 additions & 3 deletions trunk/arch/alpha/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ static void get_sysnames(unsigned long, unsigned long, unsigned long,
char **, char **);
static void determine_cpu_caches (unsigned int);

static char command_line[COMMAND_LINE_SIZE];
static char __initdata command_line[COMMAND_LINE_SIZE];

/*
* The format of "screen_info" is strange, and due to early
Expand Down Expand Up @@ -547,7 +547,7 @@ setup_arch(char **cmdline_p)
} else {
strlcpy(command_line, COMMAND_LINE, sizeof command_line);
}
strcpy(saved_command_line, command_line);
strcpy(boot_command_line, command_line);
*cmdline_p = command_line;

/*
Expand Down Expand Up @@ -589,7 +589,7 @@ setup_arch(char **cmdline_p)
}

/* Replace the command line, now that we've killed it with strsep. */
strcpy(command_line, saved_command_line);
strcpy(command_line, boot_command_line);

/* If we want SRM console printk echoing early, do it now. */
if (alpha_using_srm && srmcons_output) {
Expand Down

0 comments on commit 59ed087

Please sign in to comment.