diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-02-09 20:17:05 +0100 |
commit | 70c07e02625ec46d0ffbfce1acef42d660803528 (patch) | |
tree | f500f1a4f93e72747fb08b0eefabb167dcdc5db9 /arch/powerpc/kernel/setup_64.c | |
parent | Merge branch 'master' (diff) | |
parent | Merge branch 'net.b0' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird (diff) | |
download | linux-70c07e02625ec46d0ffbfce1acef42d660803528.tar.xz linux-70c07e02625ec46d0ffbfce1acef42d660803528.zip |
Merge branch 'viro'
Diffstat (limited to 'arch/powerpc/kernel/setup_64.c')
-rw-r--r-- | arch/powerpc/kernel/setup_64.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index e29b275e09e0..a717dff695ef 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -398,6 +398,9 @@ void __init setup_system(void) { DBG(" -> setup_system()\n"); +#ifdef CONFIG_KEXEC + kdump_move_device_tree(); +#endif /* * Unflatten the device-tree passed by prom_init or kexec */ |