Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5be85548 authored by Anton Vorontsov's avatar Anton Vorontsov Committed by Paul Mackerras
Browse files

powerpc: Remove default kexec/crash_kernel ops assignments 



Default ops are implicit now.

Signed-off-by: default avatarAnton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 77733f8a

arch/powerpc/platforms/cell/celleb_setup.c

+0 −9
Original line number Diff line number Diff line
@@ -45,7 +45,6 @@ 
#include <asm/mmu.h>

#include <asm/processor.h>

#include <asm/io.h>

#include <asm/kexec.h>

#include <asm/prom.h>

#include <asm/machdep.h>

#include <asm/cputable.h>
@@ -226,9 +225,6 @@ define_machine(celleb_beat) { 
	.pci_setup_phb		= celleb_setup_phb,

#ifdef CONFIG_KEXEC

	.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

};
@@ -248,9 +244,4 @@ define_machine(celleb_native) { 
	.pci_probe_mode 	= celleb_pci_probe_mode,

	.pci_setup_phb		= celleb_setup_phb,

	.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

};

arch/powerpc/platforms/cell/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include <asm/mmu.h>

#include <asm/processor.h>

#include <asm/io.h>

#include <asm/kexec.h>

#include <asm/pgtable.h>

#include <asm/prom.h>

#include <asm/rtas.h>
@@ -289,9 +288,4 @@ define_machine(cell) { 
	.progress		= cell_progress,

	.init_IRQ       	= cell_init_irq,

	.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

};

arch/powerpc/platforms/embedded6xx/c2k.c

+0 −6
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/seq_file.h>

#include <linux/time.h>

#include <linux/of.h>

#include <linux/kexec.h>



#include <asm/machdep.h>

#include <asm/prom.h>
@@ -147,9 +146,4 @@ define_machine(c2k) { 
	.get_irq		= mv64x60_get_irq,

	.restart		= c2k_restart,

	.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

};

arch/powerpc/platforms/embedded6xx/prpmc2800.c

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <asm/prom.h>

#include <asm/system.h>

#include <asm/time.h>

#include <asm/kexec.h>



#include <mm/mmu_decl.h>
@@ -155,9 +154,4 @@ define_machine(prpmc2800){ 
	.get_irq		= mv64x60_get_irq,

	.restart		= prpmc2800_restart,

	.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

};

arch/powerpc/platforms/maple/setup.c

+0 −6
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ 
#include <asm/system.h>

#include <asm/pgtable.h>

#include <asm/io.h>

#include <asm/kexec.h>

#include <asm/pci-bridge.h>

#include <asm/iommu.h>

#include <asm/machdep.h>
@@ -335,9 +334,4 @@ define_machine(maple) { 
      	.calibrate_decr		= generic_calibrate_decr,

	.progress		= maple_progress,

	.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

};