Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=80755b4144b303882437ac301034f0c7330199a8
Commit:     80755b4144b303882437ac301034f0c7330199a8
Parent:     74c9b99d4dcadd144fab7326c99d0ffb1de19245
Author:     Ishizaki Kou <[EMAIL PROTECTED]>
AuthorDate: Tue Oct 2 18:18:46 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Wed Oct 3 13:25:28 2007 +1000

    [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: <[EMAIL PROTECTED]>
    Acked-by: Arnd Bergmann <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/celleb/beat.c  |   12 ++++++++++++
 arch/powerpc/platforms/celleb/beat.h  |    2 ++
 arch/powerpc/platforms/celleb/setup.c |   14 +-------------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/platforms/celleb/beat.c 
b/arch/powerpc/platforms/celleb/beat.c
index 99341ce..ced6f68 100644
--- a/arch/powerpc/platforms/celleb/beat.c
+++ b/arch/powerpc/platforms/celleb/beat.c
@@ -158,6 +158,18 @@ int64_t beat_put_term_char(u64 vterm, u64 len, u64 t1, u64 
t2)
        return beat_put_characters_to_console(vterm, len, (u8*)db);
 }
 
+void beat_power_save(void)
+{
+       beat_pause(0);
+}
+
+#ifdef CONFIG_KEXEC
+void beat_kexec_cpu_down(int crash, int secondary)
+{
+       beatic_deinit_IRQ();
+}
+#endif
+
 EXPORT_SYMBOL(beat_get_term_char);
 EXPORT_SYMBOL(beat_put_term_char);
 EXPORT_SYMBOL(beat_halt_code);
diff --git a/arch/powerpc/platforms/celleb/beat.h 
b/arch/powerpc/platforms/celleb/beat.h
index 2b16bf3..b2e292d 100644
--- a/arch/powerpc/platforms/celleb/beat.h
+++ b/arch/powerpc/platforms/celleb/beat.h
@@ -36,5 +36,7 @@ ssize_t beat_nvram_get_size(void);
 ssize_t beat_nvram_read(char *, size_t, loff_t *);
 ssize_t beat_nvram_write(char *, size_t, loff_t *);
 int beat_set_xdabr(unsigned long);
+void beat_power_save(void);
+void beat_kexec_cpu_down(int, int);
 
 #endif /* _CELLEB_BEAT_H */
diff --git a/arch/powerpc/platforms/celleb/setup.c 
b/arch/powerpc/platforms/celleb/setup.c
index 1fca3f2..a2180aa 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,
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to