From: Geoff Levand <geoffrey.levand@am.sony.com>
Date: Fri, 10 Jul 2009 00:57:03 +0000 (+0000)
Subject: PS3: Revert kexec kernel patch
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ec7dc58e59ddfc8d909c4fbf00245142511d678c;p=openwrt%2Fstaging%2Frobimarko.git

PS3: Revert kexec kernel patch

Remove the uneeded PS3 kernel patch
0006-powerpc-Remove-default-kexec-crash_kernel-ops-assig.patch
This patch causes the exec system call to fail.

SVN-Revision: 16755
---

diff --git a/target/linux/ps3/patches-2.6.28/0006-powerpc-Remove-default-kexec-crash_kernel-ops-assig.patch b/target/linux/ps3/patches-2.6.28/0006-powerpc-Remove-default-kexec-crash_kernel-ops-assig.patch
deleted file mode 100644
index 5b76c85a76..0000000000
--- a/target/linux/ps3/patches-2.6.28/0006-powerpc-Remove-default-kexec-crash_kernel-ops-assig.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From 5be8554875bf3a1a42b7f04d5999b36e7c2fa88b Mon Sep 17 00:00:00 2001
-From: Anton Vorontsov <avorontsov@ru.mvista.com>
-Date: Tue, 16 Dec 2008 06:23:08 +0000
-Subject: [PATCH] powerpc: Remove default kexec/crash_kernel ops assignments
-
-Default ops are implicit now.
-
-Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
-Signed-off-by: Paul Mackerras <paulus@samba.org>
----
- arch/powerpc/platforms/cell/celleb_setup.c     |    9 ---------
- arch/powerpc/platforms/cell/setup.c            |    6 ------
- arch/powerpc/platforms/embedded6xx/c2k.c       |    6 ------
- arch/powerpc/platforms/embedded6xx/prpmc2800.c |    6 ------
- arch/powerpc/platforms/maple/setup.c           |    6 ------
- arch/powerpc/platforms/powermac/setup.c        |    6 ------
- 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 b11cb30..07c234f 100644
---- a/arch/powerpc/platforms/cell/celleb_setup.c
-+++ b/arch/powerpc/platforms/cell/celleb_setup.c
-@@ -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
- };
-diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
-index ab721b5..5930536 100644
---- a/arch/powerpc/platforms/cell/setup.c
-+++ b/arch/powerpc/platforms/cell/setup.c
-@@ -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
- };
-diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c
-index 32ba0fa..8cab573 100644
---- a/arch/powerpc/platforms/embedded6xx/c2k.c
-+++ b/arch/powerpc/platforms/embedded6xx/c2k.c
-@@ -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
- };
-diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-index 4c485e9..670035f 100644
---- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-+++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
-@@ -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
- };
-diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
-index d4c61c3..bfd60e4 100644
---- a/arch/powerpc/platforms/maple/setup.c
-+++ b/arch/powerpc/platforms/maple/setup.c
-@@ -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
- };
-diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
-index 1293772..9b78f53 100644
---- a/arch/powerpc/platforms/powermac/setup.c
-+++ b/arch/powerpc/platforms/powermac/setup.c
-@@ -60,7 +60,6 @@
- #include <asm/system.h>
- #include <asm/pgtable.h>
- #include <asm/io.h>
--#include <asm/kexec.h>
- #include <asm/pci-bridge.h>
- #include <asm/ohare.h>
- #include <asm/mediabay.h>
-@@ -738,11 +737,6 @@ define_machine(powermac) {
- 	.pci_probe_mode		= pmac_pci_probe_mode,
- 	.power_save		= power4_idle,
- 	.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 */
- #ifdef CONFIG_PPC32
- 	.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 bfc33fb..35f3e85 100644
---- a/arch/powerpc/platforms/ps3/setup.c
-+++ b/arch/powerpc/platforms/ps3/setup.c
-@@ -23,7 +23,6 @@
- #include <linux/fs.h>
- #include <linux/root_dev.h>
- #include <linux/console.h>
--#include <linux/kexec.h>
- #include <linux/bootmem.h>
- 
- #include <asm/machdep.h>
-@@ -281,8 +280,5 @@ define_machine(ps3) {
- 	.halt				= ps3_halt,
- #if defined(CONFIG_KEXEC)
- 	.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
- };
--- 
-1.6.0.4
-