git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
setup_64.c
diff --git
a/arch/powerpc/kernel/setup_64.c
b/arch/powerpc/kernel/setup_64.c
index
ab6ea37
..
78f3a5f
100644
(file)
--- a/
arch/powerpc/kernel/setup_64.c
+++ b/
arch/powerpc/kernel/setup_64.c
@@
-193,9
+193,7
@@
void __init early_setup(unsigned long dt_ptr)
/* Probe the machine type */
probe_machine();
/* Probe the machine type */
probe_machine();
-#ifdef CONFIG_CRASH_DUMP
- kdump_setup();
-#endif
+ setup_kdump_trampoline();
DBG("Found, Initializing memory management...\n");
DBG("Found, Initializing memory management...\n");
@@
-347,9
+345,6
@@
void __init setup_system(void)
{
DBG(" -> setup_system()\n");
{
DBG(" -> setup_system()\n");
-#ifdef CONFIG_KEXEC
- kdump_move_device_tree();
-#endif
/*
* Unflatten the device-tree passed by prom_init or kexec
*/
/*
* Unflatten the device-tree passed by prom_init or kexec
*/
@@
-414,10
+409,8
@@
void __init setup_system(void)
*/
register_early_udbg_console();
*/
register_early_udbg_console();
- /* Save unparsed command line copy for /proc/cmdline */
- strlcpy(saved_command_line, cmd_line, COMMAND_LINE_SIZE);
-
- parse_early_param();
+ if (do_early_xmon)
+ debugger(NULL);
check_smt_enabled();
smp_setup_cpu_maps();
check_smt_enabled();
smp_setup_cpu_maps();