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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
arch
/
powerpc
/
kernel
/
setup_32.c
diff --git
a/arch/powerpc/kernel/setup_32.c
b/arch/powerpc/kernel/setup_32.c
index
69ac257
..
e0df2ba
100644
(file)
--- a/
arch/powerpc/kernel/setup_32.c
+++ b/
arch/powerpc/kernel/setup_32.c
@@
-2,7
+2,6
@@
* Common prep/pmac/chrp boot and setup code.
*/
* Common prep/pmac/chrp boot and setup code.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/sched.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/sched.h>
@@
-52,7
+51,6
@@
extern void bootx_init(unsigned long r4, unsigned long phys);
extern void bootx_init(unsigned long r4, unsigned long phys);
-boot_infos_t *boot_infos;
struct ide_machdep_calls ppc_ide_md;
int boot_cpuid;
struct ide_machdep_calls ppc_ide_md;
int boot_cpuid;
@@
-131,12
+129,6
@@
void __init machine_init(unsigned long dt_ptr, unsigned long phys)
/* Do some early initialization based on the flat device tree */
early_init_devtree(__va(dt_ptr));
/* Do some early initialization based on the flat device tree */
early_init_devtree(__va(dt_ptr));
- /* Check default command line */
-#ifdef CONFIG_CMDLINE
- if (cmd_line[0] == 0)
- strlcpy(cmd_line, CONFIG_CMDLINE, sizeof(cmd_line));
-#endif /* CONFIG_CMDLINE */
-
probe_machine();
#ifdef CONFIG_6xx
probe_machine();
#ifdef CONFIG_6xx
@@
-221,7
+213,7
@@
int __init ppc_init(void)
/* register CPU devices */
for_each_possible_cpu(i)
/* register CPU devices */
for_each_possible_cpu(i)
- register_cpu(&cpu_devices[i], i
, NULL
);
+ register_cpu(&cpu_devices[i], i);
/* call platform init */
if (ppc_md.init != NULL) {
/* call platform init */
if (ppc_md.init != NULL) {
@@
-235,7
+227,7
@@
arch_initcall(ppc_init);
/* Warning, IO base is not yet inited */
void __init setup_arch(char **cmdline_p)
{
/* Warning, IO base is not yet inited */
void __init setup_arch(char **cmdline_p)
{
-
extern void do_init_bootmem(void)
;
+
*cmdline_p = cmd_line
;
/* so udelay does something sensible, assume <= 1000 bogomips */
loops_per_jiffy = 500000000 / HZ;
/* so udelay does something sensible, assume <= 1000 bogomips */
loops_per_jiffy = 500000000 / HZ;
@@
-247,7
+239,6
@@
void __init setup_arch(char **cmdline_p)
ppc_md.init_early();
find_legacy_serial_ports();
ppc_md.init_early();
find_legacy_serial_ports();
- finish_device_tree();
smp_setup_cpu_maps();
smp_setup_cpu_maps();
@@
-285,16
+276,16
@@
void __init setup_arch(char **cmdline_p)
/* reboot on panic */
panic_timeout = 180;
/* reboot on panic */
panic_timeout = 180;
+ if (ppc_md.panic)
+ setup_panic();
+
init_mm.start_code = PAGE_OFFSET;
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
init_mm.start_code = PAGE_OFFSET;
init_mm.end_code = (unsigned long) _etext;
init_mm.end_data = (unsigned long) _edata;
init_mm.brk = klimit;
- /* Save unparsed command line copy for /proc/cmdline */
- strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
- *cmdline_p = cmd_line;
-
- parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
/* set up the bootmem stuff with available memory */
do_init_bootmem();
/* set up the bootmem stuff with available memory */
do_init_bootmem();