| Message ID | 20170529132628.10803-1-mopsfelder@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 42bed042556261b56aa92e05f4f388f0f7ac1210 |
| Headers | show |
On 05/29/2017 06:26 AM, Murilo Opsfelder Araujo wrote: > 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> > --- > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig > index 8b9049d..e6e31a1 100644 > --- a/drivers/watchdog/Kconfig > +++ b/drivers/watchdog/Kconfig > @@ -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. > >
Murilo Opsfelder Araujo <mopsfelder@gmail.com> writes: > 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> > --- > drivers/watchdog/Kconfig | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Acked-by: Michael Ellerman <mpe@ellerman.id.au> cheers
On Mon, 2017-05-29 at 13:26:28 UTC, Murilo Opsfelder Araujo wrote: > 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> > Acked-by: Michael Ellerman <mpe@ellerman.id.au> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/42bed042556261b56aa92e05f4f388 cheers
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 8b9049d..e6e31a1 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -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.
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> --- drivers/watchdog/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)