diff options
| -rw-r--r-- | arch/powerpc/platforms/cell/celleb_setup.c | 9 | ||||
| -rw-r--r-- | arch/powerpc/platforms/cell/setup.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/c2k.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/prpmc2800.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/maple/setup.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/powermac/setup.c | 6 | ||||
| -rw-r--r-- | arch/powerpc/platforms/ps3/setup.c | 4 |
7 files changed, 0 insertions, 43 deletions
diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c index b11cb30decb2..07c234f6b2b6 100644 --- a/arch/powerpc/platforms/cell/celleb_setup.c +++ b/arch/powerpc/platforms/cell/celleb_setup.c | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | #include <asm/mmu.h> | 45 | #include <asm/mmu.h> |
| 46 | #include <asm/processor.h> | 46 | #include <asm/processor.h> |
| 47 | #include <asm/io.h> | 47 | #include <asm/io.h> |
| 48 | #include <asm/kexec.h> | ||
| 49 | #include <asm/prom.h> | 48 | #include <asm/prom.h> |
| 50 | #include <asm/machdep.h> | 49 | #include <asm/machdep.h> |
| 51 | #include <asm/cputable.h> | 50 | #include <asm/cputable.h> |
| @@ -226,9 +225,6 @@ define_machine(celleb_beat) { | |||
| 226 | .pci_setup_phb = celleb_setup_phb, | 225 | .pci_setup_phb = celleb_setup_phb, |
| 227 | #ifdef CONFIG_KEXEC | 226 | #ifdef CONFIG_KEXEC |
| 228 | .kexec_cpu_down = beat_kexec_cpu_down, | 227 | .kexec_cpu_down = beat_kexec_cpu_down, |
| 229 | .machine_kexec = default_machine_kexec, | ||
| 230 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 231 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 232 | #endif | 228 | #endif |
| 233 | }; | 229 | }; |
| 234 | 230 | ||
| @@ -248,9 +244,4 @@ define_machine(celleb_native) { | |||
| 248 | .pci_probe_mode = celleb_pci_probe_mode, | 244 | .pci_probe_mode = celleb_pci_probe_mode, |
| 249 | .pci_setup_phb = celleb_setup_phb, | 245 | .pci_setup_phb = celleb_setup_phb, |
| 250 | .init_IRQ = celleb_init_IRQ_native, | 246 | .init_IRQ = celleb_init_IRQ_native, |
| 251 | #ifdef CONFIG_KEXEC | ||
| 252 | .machine_kexec = default_machine_kexec, | ||
| 253 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 254 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 255 | #endif | ||
| 256 | }; | 247 | }; |
diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c index ab721b50fbba..59305369f6b2 100644 --- a/arch/powerpc/platforms/cell/setup.c +++ b/arch/powerpc/platforms/cell/setup.c | |||
| @@ -35,7 +35,6 @@ | |||
| 35 | #include <asm/mmu.h> | 35 | #include <asm/mmu.h> |
| 36 | #include <asm/processor.h> | 36 | #include <asm/processor.h> |
| 37 | #include <asm/io.h> | 37 | #include <asm/io.h> |
| 38 | #include <asm/kexec.h> | ||
| 39 | #include <asm/pgtable.h> | 38 | #include <asm/pgtable.h> |
| 40 | #include <asm/prom.h> | 39 | #include <asm/prom.h> |
| 41 | #include <asm/rtas.h> | 40 | #include <asm/rtas.h> |
| @@ -289,9 +288,4 @@ define_machine(cell) { | |||
| 289 | .progress = cell_progress, | 288 | .progress = cell_progress, |
| 290 | .init_IRQ = cell_init_irq, | 289 | .init_IRQ = cell_init_irq, |
| 291 | .pci_setup_phb = cell_setup_phb, | 290 | .pci_setup_phb = cell_setup_phb, |
| 292 | #ifdef CONFIG_KEXEC | ||
| 293 | .machine_kexec = default_machine_kexec, | ||
| 294 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 295 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 296 | #endif | ||
| 297 | }; | 291 | }; |
diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c index 32ba0fa0ad03..8cab5731850f 100644 --- a/arch/powerpc/platforms/embedded6xx/c2k.c +++ b/arch/powerpc/platforms/embedded6xx/c2k.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/seq_file.h> | 20 | #include <linux/seq_file.h> |
| 21 | #include <linux/time.h> | 21 | #include <linux/time.h> |
| 22 | #include <linux/of.h> | 22 | #include <linux/of.h> |
| 23 | #include <linux/kexec.h> | ||
| 24 | 23 | ||
| 25 | #include <asm/machdep.h> | 24 | #include <asm/machdep.h> |
| 26 | #include <asm/prom.h> | 25 | #include <asm/prom.h> |
| @@ -147,9 +146,4 @@ define_machine(c2k) { | |||
| 147 | .get_irq = mv64x60_get_irq, | 146 | .get_irq = mv64x60_get_irq, |
| 148 | .restart = c2k_restart, | 147 | .restart = c2k_restart, |
| 149 | .calibrate_decr = generic_calibrate_decr, | 148 | .calibrate_decr = generic_calibrate_decr, |
| 150 | #ifdef CONFIG_KEXEC | ||
| 151 | .machine_kexec = default_machine_kexec, | ||
| 152 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 153 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 154 | #endif | ||
| 155 | }; | 149 | }; |
diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c index 4c485e984236..670035f49a69 100644 --- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c +++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <asm/prom.h> | 19 | #include <asm/prom.h> |
| 20 | #include <asm/system.h> | 20 | #include <asm/system.h> |
| 21 | #include <asm/time.h> | 21 | #include <asm/time.h> |
| 22 | #include <asm/kexec.h> | ||
| 23 | 22 | ||
| 24 | #include <mm/mmu_decl.h> | 23 | #include <mm/mmu_decl.h> |
| 25 | 24 | ||
| @@ -155,9 +154,4 @@ define_machine(prpmc2800){ | |||
| 155 | .get_irq = mv64x60_get_irq, | 154 | .get_irq = mv64x60_get_irq, |
| 156 | .restart = prpmc2800_restart, | 155 | .restart = prpmc2800_restart, |
| 157 | .calibrate_decr = generic_calibrate_decr, | 156 | .calibrate_decr = generic_calibrate_decr, |
| 158 | #ifdef CONFIG_KEXEC | ||
| 159 | .machine_kexec = default_machine_kexec, | ||
| 160 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 161 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 162 | #endif | ||
| 163 | }; | 157 | }; |
diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index d4c61c3c9669..bfd60e4accee 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c | |||
| @@ -50,7 +50,6 @@ | |||
| 50 | #include <asm/system.h> | 50 | #include <asm/system.h> |
| 51 | #include <asm/pgtable.h> | 51 | #include <asm/pgtable.h> |
| 52 | #include <asm/io.h> | 52 | #include <asm/io.h> |
| 53 | #include <asm/kexec.h> | ||
| 54 | #include <asm/pci-bridge.h> | 53 | #include <asm/pci-bridge.h> |
| 55 | #include <asm/iommu.h> | 54 | #include <asm/iommu.h> |
| 56 | #include <asm/machdep.h> | 55 | #include <asm/machdep.h> |
| @@ -335,9 +334,4 @@ define_machine(maple) { | |||
| 335 | .calibrate_decr = generic_calibrate_decr, | 334 | .calibrate_decr = generic_calibrate_decr, |
| 336 | .progress = maple_progress, | 335 | .progress = maple_progress, |
| 337 | .power_save = power4_idle, | 336 | .power_save = power4_idle, |
| 338 | #ifdef CONFIG_KEXEC | ||
| 339 | .machine_kexec = default_machine_kexec, | ||
| 340 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 341 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 342 | #endif | ||
| 343 | }; | 337 | }; |
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c index 12937725f869..9b78f5300c24 100644 --- a/arch/powerpc/platforms/powermac/setup.c +++ b/arch/powerpc/platforms/powermac/setup.c | |||
| @@ -60,7 +60,6 @@ | |||
| 60 | #include <asm/system.h> | 60 | #include <asm/system.h> |
| 61 | #include <asm/pgtable.h> | 61 | #include <asm/pgtable.h> |
| 62 | #include <asm/io.h> | 62 | #include <asm/io.h> |
| 63 | #include <asm/kexec.h> | ||
| 64 | #include <asm/pci-bridge.h> | 63 | #include <asm/pci-bridge.h> |
| 65 | #include <asm/ohare.h> | 64 | #include <asm/ohare.h> |
| 66 | #include <asm/mediabay.h> | 65 | #include <asm/mediabay.h> |
| @@ -738,11 +737,6 @@ define_machine(powermac) { | |||
| 738 | .pci_probe_mode = pmac_pci_probe_mode, | 737 | .pci_probe_mode = pmac_pci_probe_mode, |
| 739 | .power_save = power4_idle, | 738 | .power_save = power4_idle, |
| 740 | .enable_pmcs = power4_enable_pmcs, | 739 | .enable_pmcs = power4_enable_pmcs, |
| 741 | #ifdef CONFIG_KEXEC | ||
| 742 | .machine_kexec = default_machine_kexec, | ||
| 743 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 744 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 745 | #endif | ||
| 746 | #endif /* CONFIG_PPC64 */ | 740 | #endif /* CONFIG_PPC64 */ |
| 747 | #ifdef CONFIG_PPC32 | 741 | #ifdef CONFIG_PPC32 |
| 748 | .pcibios_enable_device_hook = pmac_pci_enable_device_hook, | 742 | .pcibios_enable_device_hook = pmac_pci_enable_device_hook, |
diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c index bfc33fb2c7c4..35f3e85cf60e 100644 --- a/arch/powerpc/platforms/ps3/setup.c +++ b/arch/powerpc/platforms/ps3/setup.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/fs.h> | 23 | #include <linux/fs.h> |
| 24 | #include <linux/root_dev.h> | 24 | #include <linux/root_dev.h> |
| 25 | #include <linux/console.h> | 25 | #include <linux/console.h> |
| 26 | #include <linux/kexec.h> | ||
| 27 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
| 28 | 27 | ||
| 29 | #include <asm/machdep.h> | 28 | #include <asm/machdep.h> |
| @@ -281,8 +280,5 @@ define_machine(ps3) { | |||
| 281 | .halt = ps3_halt, | 280 | .halt = ps3_halt, |
| 282 | #if defined(CONFIG_KEXEC) | 281 | #if defined(CONFIG_KEXEC) |
| 283 | .kexec_cpu_down = ps3_kexec_cpu_down, | 282 | .kexec_cpu_down = ps3_kexec_cpu_down, |
| 284 | .machine_kexec = default_machine_kexec, | ||
| 285 | .machine_kexec_prepare = default_machine_kexec_prepare, | ||
| 286 | .machine_crash_shutdown = default_machine_crash_shutdown, | ||
| 287 | #endif | 283 | #endif |
| 288 | }; | 284 | }; |
