Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 48008
b: refs/heads/master
c: 3561794
h: refs/heads/master
v: v3
  • Loading branch information
Alon Bar-Lev authored and Linus Torvalds committed Feb 12, 2007
1 parent 5c35a12 commit fb8a5c5
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: a8d91b8477aa433ee0131b031d782411976e1726
refs/heads/master: 3561794d80843588ed8b47fffb20e2dcd9c40ff3
6 changes: 3 additions & 3 deletions trunk/arch/m32r/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ struct screen_info screen_info = {

extern int root_mountflags;

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

static struct resource data_resource = {
.name = "Kernel data",
Expand Down Expand Up @@ -95,8 +95,8 @@ static __inline__ void parse_mem_cmdline(char ** cmdline_p)
int usermem = 0;

/* Save unparsed command line copy for /proc/cmdline */
memcpy(saved_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
saved_command_line[COMMAND_LINE_SIZE-1] = '\0';
memcpy(boot_command_line, COMMAND_LINE, COMMAND_LINE_SIZE);
boot_command_line[COMMAND_LINE_SIZE-1] = '\0';

memory_start = (unsigned long)CONFIG_MEMORY_START+PAGE_OFFSET;
memory_end = memory_start+(unsigned long)CONFIG_MEMORY_SIZE;
Expand Down

0 comments on commit fb8a5c5

Please sign in to comment.