提交 5be85548 编写于 作者: A Anton Vorontsov 提交者: Paul Mackerras

powerpc: Remove default kexec/crash_kernel ops assignments

Default ops are implicit now.
Signed-off-by: NAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: NPaul Mackerras <paulus@samba.org>
上级 77733f8a
...@@ -45,7 +45,6 @@ ...@@ -45,7 +45,6 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/kexec.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/cputable.h> #include <asm/cputable.h>
...@@ -226,9 +225,6 @@ define_machine(celleb_beat) { ...@@ -226,9 +225,6 @@ define_machine(celleb_beat) {
.pci_setup_phb = celleb_setup_phb, .pci_setup_phb = celleb_setup_phb,
#ifdef CONFIG_KEXEC #ifdef CONFIG_KEXEC
.kexec_cpu_down = beat_kexec_cpu_down, .kexec_cpu_down = beat_kexec_cpu_down,
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif #endif
}; };
...@@ -248,9 +244,4 @@ define_machine(celleb_native) { ...@@ -248,9 +244,4 @@ define_machine(celleb_native) {
.pci_probe_mode = celleb_pci_probe_mode, .pci_probe_mode = celleb_pci_probe_mode,
.pci_setup_phb = celleb_setup_phb, .pci_setup_phb = celleb_setup_phb,
.init_IRQ = celleb_init_IRQ_native, .init_IRQ = celleb_init_IRQ_native,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
}; };
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include <asm/mmu.h> #include <asm/mmu.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/kexec.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/rtas.h> #include <asm/rtas.h>
...@@ -289,9 +288,4 @@ define_machine(cell) { ...@@ -289,9 +288,4 @@ define_machine(cell) {
.progress = cell_progress, .progress = cell_progress,
.init_IRQ = cell_init_irq, .init_IRQ = cell_init_irq,
.pci_setup_phb = cell_setup_phb, .pci_setup_phb = cell_setup_phb,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
}; };
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/kexec.h>
#include <asm/machdep.h> #include <asm/machdep.h>
#include <asm/prom.h> #include <asm/prom.h>
...@@ -147,9 +146,4 @@ define_machine(c2k) { ...@@ -147,9 +146,4 @@ define_machine(c2k) {
.get_irq = mv64x60_get_irq, .get_irq = mv64x60_get_irq,
.restart = c2k_restart, .restart = c2k_restart,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
}; };
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
#include <asm/prom.h> #include <asm/prom.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/time.h> #include <asm/time.h>
#include <asm/kexec.h>
#include <mm/mmu_decl.h> #include <mm/mmu_decl.h>
...@@ -155,9 +154,4 @@ define_machine(prpmc2800){ ...@@ -155,9 +154,4 @@ define_machine(prpmc2800){
.get_irq = mv64x60_get_irq, .get_irq = mv64x60_get_irq,
.restart = prpmc2800_restart, .restart = prpmc2800_restart,
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
}; };
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/kexec.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/iommu.h> #include <asm/iommu.h>
#include <asm/machdep.h> #include <asm/machdep.h>
...@@ -335,9 +334,4 @@ define_machine(maple) { ...@@ -335,9 +334,4 @@ define_machine(maple) {
.calibrate_decr = generic_calibrate_decr, .calibrate_decr = generic_calibrate_decr,
.progress = maple_progress, .progress = maple_progress,
.power_save = power4_idle, .power_save = power4_idle,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
}; };
...@@ -60,7 +60,6 @@ ...@@ -60,7 +60,6 @@
#include <asm/system.h> #include <asm/system.h>
#include <asm/pgtable.h> #include <asm/pgtable.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/kexec.h>
#include <asm/pci-bridge.h> #include <asm/pci-bridge.h>
#include <asm/ohare.h> #include <asm/ohare.h>
#include <asm/mediabay.h> #include <asm/mediabay.h>
...@@ -738,11 +737,6 @@ define_machine(powermac) { ...@@ -738,11 +737,6 @@ define_machine(powermac) {
.pci_probe_mode = pmac_pci_probe_mode, .pci_probe_mode = pmac_pci_probe_mode,
.power_save = power4_idle, .power_save = power4_idle,
.enable_pmcs = power4_enable_pmcs, .enable_pmcs = power4_enable_pmcs,
#ifdef CONFIG_KEXEC
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif
#endif /* CONFIG_PPC64 */ #endif /* CONFIG_PPC64 */
#ifdef CONFIG_PPC32 #ifdef CONFIG_PPC32
.pcibios_enable_device_hook = pmac_pci_enable_device_hook, .pcibios_enable_device_hook = pmac_pci_enable_device_hook,
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/root_dev.h> #include <linux/root_dev.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/kexec.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <asm/machdep.h> #include <asm/machdep.h>
...@@ -281,8 +280,5 @@ define_machine(ps3) { ...@@ -281,8 +280,5 @@ define_machine(ps3) {
.halt = ps3_halt, .halt = ps3_halt,
#if defined(CONFIG_KEXEC) #if defined(CONFIG_KEXEC)
.kexec_cpu_down = ps3_kexec_cpu_down, .kexec_cpu_down = ps3_kexec_cpu_down,
.machine_kexec = default_machine_kexec,
.machine_kexec_prepare = default_machine_kexec_prepare,
.machine_crash_shutdown = default_machine_crash_shutdown,
#endif #endif
}; };
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册