projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] powerpc: Merge kexec
[deliverable/linux.git]
/
arch
/
powerpc
/
platforms
/
maple
/
setup.c
diff --git
a/arch/powerpc/platforms/maple/setup.c
b/arch/powerpc/platforms/maple/setup.c
index 7ece8983a105d2b87e50155f9a10950fd5483c57..95b2352655fe943e57f2350971608859d531d9cb 100644
(file)
--- a/
arch/powerpc/platforms/maple/setup.c
+++ b/
arch/powerpc/platforms/maple/setup.c
@@
-51,6
+51,7
@@
#include <asm/pgtable.h>
#include <asm/bitops.h>
#include <asm/io.h>
#include <asm/pgtable.h>
#include <asm/bitops.h>
#include <asm/io.h>
+#include <asm/kexec.h>
#include <asm/pci-bridge.h>
#include <asm/iommu.h>
#include <asm/machdep.h>
#include <asm/pci-bridge.h>
#include <asm/iommu.h>
#include <asm/machdep.h>
@@
-292,4
+293,8
@@
struct machdep_calls __initdata maple_md = {
.calibrate_decr = generic_calibrate_decr,
.progress = maple_progress,
.idle_loop = native_idle,
.calibrate_decr = generic_calibrate_decr,
.progress = maple_progress,
.idle_loop = native_idle,
+#ifdef CONFIG_KEXEC
+ .machine_kexec = default_machine_kexec,
+ .machine_kexec_prepare = default_machine_kexec_prepare,
+#endif
};
};
This page took
0.026071 seconds
and
5
git commands to generate.