diff options
| author |   Ishizaki Kou <kou.ishizaki@toshiba.co.jp> | 2007-10-02 18:18:46 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2007-10-03 13:25:28 +1000 |
| commit | 80755b4144b303882437ac301034f0c7330199a8 (patch) | |
| tree | cf224c8a9a683b87106ee61764da9d7ed53ed6e7 /arch/powerpc/platforms/celleb/setup.c | |
| parent | [POWERPC] ibmebus: More descriptive error return code in ibmebus_store_probe() (diff) | |
| download | linux-dev-80755b4144b303882437ac301034f0c7330199a8.tar.xz linux-dev-80755b4144b303882437ac301034f0c7330199a8.zip | |
[POWERPC] Celleb: Move pause, kexec_cpu_down to beat.c
This is an update for "Beat on Celleb"
- Move beat_pause(), beat_kexec_cpu_down() from setup.c to beat.c
Signed-off-by: <Kou.Ishizaki@toshiba.co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/celleb/setup.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/celleb/setup.c b/arch/powerpc/platforms/celleb/setup.c index 1fca3f23533b..a2180aa509d9 100644 --- a/arch/powerpc/platforms/celleb/setup.c +++ b/arch/powerpc/platforms/celleb/setup.c @@ -111,11 +111,6 @@ static void __init celleb_setup_arch(void) #endif } -static void beat_power_save(void) -{ - beat_pause(0); -} - static int __init celleb_probe(void) { unsigned long root = of_get_flat_dt_root(); @@ -128,13 +123,6 @@ static int __init celleb_probe(void) return 1; } -#ifdef CONFIG_KEXEC -static void celleb_kexec_cpu_down(int crash, int secondary) -{ - beatic_deinit_IRQ(); -} -#endif - static struct of_device_id celleb_bus_ids[] __initdata = { { .type = "scc", }, { .type = "ioif", }, /* old style */ @@ -175,7 +163,7 @@ define_machine(celleb) { .pci_probe_mode = celleb_pci_probe_mode, .pci_setup_phb = celleb_setup_phb, #ifdef CONFIG_KEXEC - .kexec_cpu_down = celleb_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, |