git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
arch
/
m68knommu
/
kernel
/
setup.c
diff --git
a/arch/m68knommu/kernel/setup.c
b/arch/m68knommu/kernel/setup.c
index
edcecd4
..
bd6a4a8
100644
(file)
--- a/
arch/m68knommu/kernel/setup.c
+++ b/
arch/m68knommu/kernel/setup.c
@@
-31,7
+31,6
@@
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/root_dev.h>
-#include <linux/init.h>
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@
-45,7
+44,8
@@
unsigned long rom_length;
unsigned long memory_start;
unsigned long memory_end;
unsigned long memory_start;
unsigned long memory_end;
-char command_line[COMMAND_LINE_SIZE];
+char command_line[512];
+char saved_command_line[512];
/* setup some dummy routines */
static void dummy_waitbut(void)
/* setup some dummy routines */
static void dummy_waitbut(void)
@@
-216,8
+216,8
@@
void setup_arch(char **cmdline_p)
/* Keep a copy of command line */
*cmdline_p = &command_line[0];
/* Keep a copy of command line */
*cmdline_p = &command_line[0];
- memcpy(saved_command_line, command_line,
COMMAND_LINE_SIZE
);
- saved_command_line[
COMMAND_LINE_SIZE
-1] = 0;
+ memcpy(saved_command_line, command_line,
sizeof(saved_command_line)
);
+ saved_command_line[
sizeof(saved_command_line)
-1] = 0;
#ifdef DEBUG
if (strlen(*cmdline_p))
#ifdef DEBUG
if (strlen(*cmdline_p))