ps3: update ps3vram patches
[openwrt/svn-archive/archive.git] / target / linux / ps3 / patches-2.6.28 / 0006-powerpc-Remove-default-kexec-crash_kernel-ops-assig.patch
1 From 5be8554875bf3a1a42b7f04d5999b36e7c2fa88b Mon Sep 17 00:00:00 2001
2 From: Anton Vorontsov <avorontsov@ru.mvista.com>
3 Date: Tue, 16 Dec 2008 06:23:08 +0000
4 Subject: [PATCH] powerpc: Remove default kexec/crash_kernel ops assignments
5
6 Default ops are implicit now.
7
8 Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
9 Signed-off-by: Paul Mackerras <paulus@samba.org>
10 ---
11 arch/powerpc/platforms/cell/celleb_setup.c | 9 ---------
12 arch/powerpc/platforms/cell/setup.c | 6 ------
13 arch/powerpc/platforms/embedded6xx/c2k.c | 6 ------
14 arch/powerpc/platforms/embedded6xx/prpmc2800.c | 6 ------
15 arch/powerpc/platforms/maple/setup.c | 6 ------
16 arch/powerpc/platforms/powermac/setup.c | 6 ------
17 arch/powerpc/platforms/ps3/setup.c | 4 ----
18 7 files changed, 0 insertions(+), 43 deletions(-)
19
20 diff --git a/arch/powerpc/platforms/cell/celleb_setup.c b/arch/powerpc/platforms/cell/celleb_setup.c
21 index b11cb30..07c234f 100644
22 --- a/arch/powerpc/platforms/cell/celleb_setup.c
23 +++ b/arch/powerpc/platforms/cell/celleb_setup.c
24 @@ -45,7 +45,6 @@
25 #include <asm/mmu.h>
26 #include <asm/processor.h>
27 #include <asm/io.h>
28 -#include <asm/kexec.h>
29 #include <asm/prom.h>
30 #include <asm/machdep.h>
31 #include <asm/cputable.h>
32 @@ -226,9 +225,6 @@ define_machine(celleb_beat) {
33 .pci_setup_phb = celleb_setup_phb,
34 #ifdef CONFIG_KEXEC
35 .kexec_cpu_down = beat_kexec_cpu_down,
36 - .machine_kexec = default_machine_kexec,
37 - .machine_kexec_prepare = default_machine_kexec_prepare,
38 - .machine_crash_shutdown = default_machine_crash_shutdown,
39 #endif
40 };
41
42 @@ -248,9 +244,4 @@ define_machine(celleb_native) {
43 .pci_probe_mode = celleb_pci_probe_mode,
44 .pci_setup_phb = celleb_setup_phb,
45 .init_IRQ = celleb_init_IRQ_native,
46 -#ifdef CONFIG_KEXEC
47 - .machine_kexec = default_machine_kexec,
48 - .machine_kexec_prepare = default_machine_kexec_prepare,
49 - .machine_crash_shutdown = default_machine_crash_shutdown,
50 -#endif
51 };
52 diff --git a/arch/powerpc/platforms/cell/setup.c b/arch/powerpc/platforms/cell/setup.c
53 index ab721b5..5930536 100644
54 --- a/arch/powerpc/platforms/cell/setup.c
55 +++ b/arch/powerpc/platforms/cell/setup.c
56 @@ -35,7 +35,6 @@
57 #include <asm/mmu.h>
58 #include <asm/processor.h>
59 #include <asm/io.h>
60 -#include <asm/kexec.h>
61 #include <asm/pgtable.h>
62 #include <asm/prom.h>
63 #include <asm/rtas.h>
64 @@ -289,9 +288,4 @@ define_machine(cell) {
65 .progress = cell_progress,
66 .init_IRQ = cell_init_irq,
67 .pci_setup_phb = cell_setup_phb,
68 -#ifdef CONFIG_KEXEC
69 - .machine_kexec = default_machine_kexec,
70 - .machine_kexec_prepare = default_machine_kexec_prepare,
71 - .machine_crash_shutdown = default_machine_crash_shutdown,
72 -#endif
73 };
74 diff --git a/arch/powerpc/platforms/embedded6xx/c2k.c b/arch/powerpc/platforms/embedded6xx/c2k.c
75 index 32ba0fa..8cab573 100644
76 --- a/arch/powerpc/platforms/embedded6xx/c2k.c
77 +++ b/arch/powerpc/platforms/embedded6xx/c2k.c
78 @@ -20,7 +20,6 @@
79 #include <linux/seq_file.h>
80 #include <linux/time.h>
81 #include <linux/of.h>
82 -#include <linux/kexec.h>
83
84 #include <asm/machdep.h>
85 #include <asm/prom.h>
86 @@ -147,9 +146,4 @@ define_machine(c2k) {
87 .get_irq = mv64x60_get_irq,
88 .restart = c2k_restart,
89 .calibrate_decr = generic_calibrate_decr,
90 -#ifdef CONFIG_KEXEC
91 - .machine_kexec = default_machine_kexec,
92 - .machine_kexec_prepare = default_machine_kexec_prepare,
93 - .machine_crash_shutdown = default_machine_crash_shutdown,
94 -#endif
95 };
96 diff --git a/arch/powerpc/platforms/embedded6xx/prpmc2800.c b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
97 index 4c485e9..670035f 100644
98 --- a/arch/powerpc/platforms/embedded6xx/prpmc2800.c
99 +++ b/arch/powerpc/platforms/embedded6xx/prpmc2800.c
100 @@ -19,7 +19,6 @@
101 #include <asm/prom.h>
102 #include <asm/system.h>
103 #include <asm/time.h>
104 -#include <asm/kexec.h>
105
106 #include <mm/mmu_decl.h>
107
108 @@ -155,9 +154,4 @@ define_machine(prpmc2800){
109 .get_irq = mv64x60_get_irq,
110 .restart = prpmc2800_restart,
111 .calibrate_decr = generic_calibrate_decr,
112 -#ifdef CONFIG_KEXEC
113 - .machine_kexec = default_machine_kexec,
114 - .machine_kexec_prepare = default_machine_kexec_prepare,
115 - .machine_crash_shutdown = default_machine_crash_shutdown,
116 -#endif
117 };
118 diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
119 index d4c61c3..bfd60e4 100644
120 --- a/arch/powerpc/platforms/maple/setup.c
121 +++ b/arch/powerpc/platforms/maple/setup.c
122 @@ -50,7 +50,6 @@
123 #include <asm/system.h>
124 #include <asm/pgtable.h>
125 #include <asm/io.h>
126 -#include <asm/kexec.h>
127 #include <asm/pci-bridge.h>
128 #include <asm/iommu.h>
129 #include <asm/machdep.h>
130 @@ -335,9 +334,4 @@ define_machine(maple) {
131 .calibrate_decr = generic_calibrate_decr,
132 .progress = maple_progress,
133 .power_save = power4_idle,
134 -#ifdef CONFIG_KEXEC
135 - .machine_kexec = default_machine_kexec,
136 - .machine_kexec_prepare = default_machine_kexec_prepare,
137 - .machine_crash_shutdown = default_machine_crash_shutdown,
138 -#endif
139 };
140 diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
141 index 1293772..9b78f53 100644
142 --- a/arch/powerpc/platforms/powermac/setup.c
143 +++ b/arch/powerpc/platforms/powermac/setup.c
144 @@ -60,7 +60,6 @@
145 #include <asm/system.h>
146 #include <asm/pgtable.h>
147 #include <asm/io.h>
148 -#include <asm/kexec.h>
149 #include <asm/pci-bridge.h>
150 #include <asm/ohare.h>
151 #include <asm/mediabay.h>
152 @@ -738,11 +737,6 @@ define_machine(powermac) {
153 .pci_probe_mode = pmac_pci_probe_mode,
154 .power_save = power4_idle,
155 .enable_pmcs = power4_enable_pmcs,
156 -#ifdef CONFIG_KEXEC
157 - .machine_kexec = default_machine_kexec,
158 - .machine_kexec_prepare = default_machine_kexec_prepare,
159 - .machine_crash_shutdown = default_machine_crash_shutdown,
160 -#endif
161 #endif /* CONFIG_PPC64 */
162 #ifdef CONFIG_PPC32
163 .pcibios_enable_device_hook = pmac_pci_enable_device_hook,
164 diff --git a/arch/powerpc/platforms/ps3/setup.c b/arch/powerpc/platforms/ps3/setup.c
165 index bfc33fb..35f3e85 100644
166 --- a/arch/powerpc/platforms/ps3/setup.c
167 +++ b/arch/powerpc/platforms/ps3/setup.c
168 @@ -23,7 +23,6 @@
169 #include <linux/fs.h>
170 #include <linux/root_dev.h>
171 #include <linux/console.h>
172 -#include <linux/kexec.h>
173 #include <linux/bootmem.h>
174
175 #include <asm/machdep.h>
176 @@ -281,8 +280,5 @@ define_machine(ps3) {
177 .halt = ps3_halt,
178 #if defined(CONFIG_KEXEC)
179 .kexec_cpu_down = ps3_kexec_cpu_down,
180 - .machine_kexec = default_machine_kexec,
181 - .machine_kexec_prepare = default_machine_kexec_prepare,
182 - .machine_crash_shutdown = default_machine_crash_shutdown,
183 #endif
184 };
185 --
186 1.6.0.4
187