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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
h8300
/
kernel
/
setup.c
diff --git
a/arch/h8300/kernel/setup.c
b/arch/h8300/kernel/setup.c
index
bf5822c
..
6adf8f4
100644
(file)
--- a/
arch/h8300/kernel/setup.c
+++ b/
arch/h8300/kernel/setup.c
@@
-16,7
+16,6
@@
* This file handles the architecture-dependent parts of system setup
*/
* This file handles the architecture-dependent parts of system setup
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/delay.h>
@@
-30,6
+29,7
@@
#include <linux/major.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
#include <linux/major.h>
#include <linux/bootmem.h>
#include <linux/seq_file.h>
+#include <linux/init.h>
#include <asm/setup.h>
#include <asm/irq.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@
-54,8
+54,7
@@
unsigned long rom_length;
unsigned long memory_start;
unsigned long memory_end;
unsigned long memory_start;
unsigned long memory_end;
-char command_line[512];
-char saved_command_line[512];
+char command_line[COMMAND_LINE_SIZE];
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
extern int _ramstart, _ramend;
@@
-117,7
+116,7
@@
void __init setup_arch(char **cmdline_p)
#endif
#else
if ((memory_end < CONFIG_BLKDEV_RESERVE_ADDRESS) &&
#endif
#else
if ((memory_end < CONFIG_BLKDEV_RESERVE_ADDRESS) &&
- (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS)
+ (memory_end > CONFIG_BLKDEV_RESERVE_ADDRESS)
)
/* overlap userarea */
memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS;
#endif
/* overlap userarea */
memory_end = CONFIG_BLKDEV_RESERVE_ADDRESS;
#endif
@@
-155,8
+154,8
@@
void __init setup_arch(char **cmdline_p)
#endif
/* Keep a copy of command line */
*cmdline_p = &command_line[0];
#endif
/* Keep a copy of command line */
*cmdline_p = &command_line[0];
- memcpy(saved_command_line, command_line,
sizeof(saved_command_line)
);
- saved_command_line[
sizeof(saved_command_line)
-1] = 0;
+ memcpy(saved_command_line, command_line,
COMMAND_LINE_SIZE
);
+ saved_command_line[
COMMAND_LINE_SIZE
-1] = 0;
#ifdef DEBUG
if (strlen(*cmdline_p))
#ifdef DEBUG
if (strlen(*cmdline_p))
@@
-218,7
+217,7
@@
static int show_cpuinfo(struct seq_file *m, void *v)
"BogoMips:\t%lu.%02lu\n"
"Calibration:\t%lu loops\n",
cpu,mode,
"BogoMips:\t%lu.%02lu\n"
"Calibration:\t%lu loops\n",
cpu,mode,
- clockfreq/100
,clockfreq%1
00,
+ clockfreq/100
0,clockfreq%10
00,
(loops_per_jiffy*HZ)/500000,((loops_per_jiffy*HZ)/5000)%100,
(loops_per_jiffy*HZ));
(loops_per_jiffy*HZ)/500000,((loops_per_jiffy*HZ)/5000)%100,
(loops_per_jiffy*HZ));