* [PATCH 2/7] Celleb: Move pause, kexec_cpu_down to beat.c
@ 2007-09-26 4:23 Ishizaki Kou
2007-09-26 11:40 ` Arnd Bergmann
0 siblings, 1 reply; 3+ messages in thread
From: Ishizaki Kou @ 2007-09-26 4:23 UTC (permalink / raw)
To: paulus; +Cc: linuxppc-dev
This patch 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>
---
Index: linux-powerpc-git/arch/powerpc/platforms/celleb/beat.h
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/platforms/celleb/beat.h
+++ linux-powerpc-git/arch/powerpc/platforms/celleb/beat.h
@@ -36,5 +36,9 @@ 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);
+#ifdef CONFIG_KEXEC
+void beat_kexec_cpu_down(int, int);
+#endif
#endif /* _CELLEB_BEAT_H */
Index: linux-powerpc-git/arch/powerpc/platforms/celleb/setup.c
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/platforms/celleb/setup.c
+++ linux-powerpc-git/arch/powerpc/platforms/celleb/setup.c
@@ -111,11 +111,6 @@ static void __init celleb_setup_arch(voi
#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,
Index: linux-powerpc-git/arch/powerpc/platforms/celleb/beat.c
===================================================================
--- linux-powerpc-git.orig/arch/powerpc/platforms/celleb/beat.c
+++ linux-powerpc-git/arch/powerpc/platforms/celleb/beat.c
@@ -158,6 +158,18 @@ int64_t beat_put_term_char(u64 vterm, u6
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);
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/7] Celleb: Move pause, kexec_cpu_down to beat.c
2007-09-26 4:23 [PATCH 2/7] Celleb: Move pause, kexec_cpu_down to beat.c Ishizaki Kou
@ 2007-09-26 11:40 ` Arnd Bergmann
2007-09-27 8:27 ` Ishizaki Kou
0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2007-09-26 11:40 UTC (permalink / raw)
To: linuxppc-dev; +Cc: paulus
On Wednesday 26 September 2007, Ishizaki Kou wrote:
> This patch is an update for "Beat on Celleb"
> =A0 - Move beat_pause(), beat_kexec_cpu_down() from setup.c to beat.c
>=20
> Signed-off-by: <Kou.Ishizaki@toshiba•co.jp>
Acked-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
The patch looks good, once you fix this one line:
> @@ -36,5 +36,9 @@ ssize_t beat_nvram_get_size(void);
> =A0ssize_t beat_nvram_read(char *, size_t, loff_t *);
> =A0ssize_t beat_nvram_write(char *, size_t, loff_t *);
> =A0int beat_set_xdabr(unsigned long);
> +void beat_power_save(void);
> +#ifdef CONFIG_KEXEC
> +void beat_kexec_cpu_down(int, int);
> +#endif
=46unction declarations in headers files should not be enclosed in #ifdef,
it only causes unnecessary rebuilds when the configuration changes, but
does not help.
Arnd <><
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 2/7] Celleb: Move pause, kexec_cpu_down to beat.c
2007-09-26 11:40 ` Arnd Bergmann
@ 2007-09-27 8:27 ` Ishizaki Kou
0 siblings, 0 replies; 3+ messages in thread
From: Ishizaki Kou @ 2007-09-27 8:27 UTC (permalink / raw)
To: arnd; +Cc: linuxppc-dev, paulus
> On Wednesday 26 September 2007, Ishizaki Kou wrote:
> > This patch is an update for "Beat on Celleb"
> > - Move beat_pause(), beat_kexec_cpu_down() from setup.c to beat.c
> >=20
> > Signed-off-by: <Kou.Ishizaki@toshiba•co.jp>
>=20
> Acked-by: Arnd Bergmann <arnd.bergmann@de•ibm.com>
>=20
> The patch looks good, once you fix this one line:
>=20
> > @@ -36,5 +36,9 @@ 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);
> > +#ifdef CONFIG_KEXEC
> > +void beat_kexec_cpu_down(int, int);
> > +#endif
>=20
> Function declarations in headers files should not be enclosed in =
#ifdef,
> it only causes unnecessary rebuilds when the configuration changes, =
but
> does not help.
Agreed. I'll post an updated patch.
Best regards,
Kou Ishizaki
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-09-27 8:27 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-09-26 4:23 [PATCH 2/7] Celleb: Move pause, kexec_cpu_down to beat.c Ishizaki Kou
2007-09-26 11:40 ` Arnd Bergmann
2007-09-27 8:27 ` Ishizaki Kou
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox