Skip to content

Commit

Permalink
drivers/watchdog/Kconfig: Update CONFIG_WATCHDOG_RTAS dependencies
Browse files Browse the repository at this point in the history 
drivers/watchdog/wdrtas.c uses symbols defined in arch/powerpc/kernel/rtas.c,
which are exported iff CONFIG_PPC_RTAS is selected. Building wdrtas.c without
setting CONFIG_PPC_RTAS throws the following errors:

    ERROR: ".rtas_token" [drivers/watchdog/wdrtas.ko] undefined!
    ERROR: "rtas_data_buf" [drivers/watchdog/wdrtas.ko] undefined!
    ERROR: "rtas_data_buf_lock" [drivers/watchdog/wdrtas.ko] undefined!
    ERROR: ".rtas_get_sensor" [drivers/watchdog/wdrtas.ko] undefined!
    ERROR: ".rtas_call" [drivers/watchdog/wdrtas.ko] undefined!

This was identified during a randconfig build where CONFIG_WATCHDOG_RTAS=m and
CONFIG_PPC_RTAS was not set. Logs are here:

    http://kisskb.ellerman.id.au/kisskb/buildresult/12982152/

This patch fixes the issue by updating CONFIG_WATCHDOG_RTAS to depend on just
CONFIG_PPC_RTAS, removing COMPILE_TEST entirely.

Signed-off-by: Murilo Opsfelder Araujo <mopsfelder@gmail.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Murilo Opsfelder Araujo authored and Michael Ellerman committed Jun 15, 2017
1 parent 07d2a62 commit 42bed04
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/watchdog/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1688,7 +1688,7 @@ config MEN_A21_WDT

config WATCHDOG_RTAS
tristate "RTAS watchdog"
depends on PPC_RTAS || (PPC64 && COMPILE_TEST)
depends on PPC_RTAS
help
This driver adds watchdog support for the RTAS watchdog.

Expand Down

0 comments on commit 42bed04

Please sign in to comment.