tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

powerpc/ps3: move udbg_shutdown_ps3gelic prototype

Allmodconfig kernels produce a missing-prototypes warning:

arch/powerpc/platforms/ps3/gelic_udbg.c:239:6: error: no previous prototype for 'udbg_shutdown_ps3gelic' [-Werror=missing-prototypes]

Move the declaration from a local header to asm/ps3.h where it can be
seen from both the caller and the definition.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Geoff Levand <geoff@infradead.org>
Acked-by: Jakub Kicinski <kuba@kernel.org>
[mpe: Drop CONFIG_PS3GELIC_UDBG to fix build error]
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20231108125843.3806765-18-arnd@kernel.org

authored by

Arnd Bergmann and committed by
Michael Ellerman 04c40eed 98b1cc82

+8 -20
-1
arch/powerpc/Kconfig.debug
··· 271 271 config PPC_EARLY_DEBUG_PS3GELIC 272 272 bool "Early debugging through the PS3 Ethernet port" 273 273 depends on PPC_PS3 274 - select PS3GELIC_UDBG 275 274 help 276 275 Select this to enable early debugging for the PlayStation3 via 277 276 UDP broadcasts sent out through the Ethernet port.
+6
arch/powerpc/include/asm/ps3.h
··· 514 514 515 515 void ps3_early_mm_init(void); 516 516 517 + #ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC 518 + void udbg_shutdown_ps3gelic(void); 519 + #else 520 + static inline void udbg_shutdown_ps3gelic(void) {} 521 + #endif 522 + 517 523 #endif
-12
arch/powerpc/platforms/ps3/Kconfig
··· 167 167 profiling support of the Cell processor with programs like 168 168 perfmon2, then say Y or M, otherwise say N. 169 169 170 - config PS3GELIC_UDBG 171 - bool "PS3 udbg output via UDP broadcasts on Ethernet" 172 - depends on PPC_PS3 173 - help 174 - Enables udbg early debugging output by sending broadcast UDP 175 - via the Ethernet port (UDP port number 18194). 176 - 177 - This driver uses a trivial implementation and is independent 178 - from the main PS3 gelic network driver. 179 - 180 - If in doubt, say N here. 181 - 182 170 endmenu
+1 -1
arch/powerpc/platforms/ps3/Makefile
··· 3 3 obj-y += interrupt.o exports.o os-area.o 4 4 obj-y += system-bus.o 5 5 6 - obj-$(CONFIG_PS3GELIC_UDBG) += gelic_udbg.o 6 + obj-$(CONFIG_PPC_EARLY_DEBUG_PS3GELIC) += gelic_udbg.o 7 7 obj-$(CONFIG_SMP) += smp.o 8 8 obj-$(CONFIG_SPU_BASE) += spu.o 9 9 obj-y += device-init.o
+1
arch/powerpc/platforms/ps3/gelic_udbg.c
··· 14 14 #include <linux/ip.h> 15 15 #include <linux/udp.h> 16 16 17 + #include <asm/ps3.h> 17 18 #include <asm/io.h> 18 19 #include <asm/udbg.h> 19 20 #include <asm/lv1call.h>
-6
drivers/net/ethernet/toshiba/ps3_gelic_net.h
··· 346 346 return port->priv; 347 347 } 348 348 349 - #ifdef CONFIG_PPC_EARLY_DEBUG_PS3GELIC 350 - void udbg_shutdown_ps3gelic(void); 351 - #else 352 - static inline void udbg_shutdown_ps3gelic(void) {} 353 - #endif 354 - 355 349 int gelic_card_set_irq_mask(struct gelic_card *card, u64 mask); 356 350 /* shared netdev ops */ 357 351 void gelic_card_up(struct gelic_card *card);