[PATCH] printk: add dummy printk_force_console_enter/exit helpers

[PATCH] printk: add dummy printk_force_console_enter/exit helpers

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The newly added interface is broken when PRINTK is disabled:

drivers/tty/sysrq.c: In function '__handle_sysrq':
drivers/tty/sysrq.c:601:9: error: implicit declaration of function 'printk_force_console_enter' [-Wimplicit-function-declaration]
  601 |         printk_force_console_enter();
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/tty/sysrq.c:611:25: error: implicit declaration of function 'printk_force_console_exit' [-Wimplicit-function-declaration]
  611 |                         printk_force_console_exit();
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~

Add empty stub functions for both.

Fixes: ed76c07c6885 ("printk: Introduce FORCE_CON flag")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 include/linux/printk.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 232e5fd06701..0f2d7bdcea54 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -232,6 +232,14 @@ static inline void printk_deferred_exit(void)
 {
 }
 
+static void printk_force_console_enter(void)
+{
+}
+
+static void printk_force_console_exit(void)
+{
+}
+
 static inline int printk_ratelimit(void)
 {
 	return 0;
-- 
2.39.5

[PATCH] [v2] printk: add dummy printk_force_console_enter/exit helpers

[Arnd Bergmann]

From: Arnd Bergmann <arnd@arndb.de>

The newly added interface is broken when PRINTK is disabled:

drivers/tty/sysrq.c: In function '__handle_sysrq':
drivers/tty/sysrq.c:601:9: error: implicit declaration of function 'printk_force_console_enter' [-Wimplicit-function-declaration]
  601 |         printk_force_console_enter();
      |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/tty/sysrq.c:611:25: error: implicit declaration of function 'printk_force_console_exit' [-Wimplicit-function-declaration]
  611 |                         printk_force_console_exit();
      |                         ^~~~~~~~~~~~~~~~~~~~~~~~~

Add empty stub functions for both.

Fixes: ed76c07c6885 ("printk: Introduce FORCE_CON flag")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
v2: realized I sent the wrong version that was missing 'inline'.
---
 include/linux/printk.h | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/include/linux/printk.h b/include/linux/printk.h
index 232e5fd06701..4217a9f412b2 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -232,6 +232,14 @@ static inline void printk_deferred_exit(void)
 {
 }
 
+static inline void printk_force_console_enter(void)
+{
+}
+
+static inline void printk_force_console_exit(void)
+{
+}
+
 static inline int printk_ratelimit(void)
 {
 	return 0;
-- 
2.39.5

Re: [PATCH] [v2] printk: add dummy printk_force_console_enter/exit helpers

[Andy Shevchenko]

On Tue, Nov 12, 2024 at 03:29:15PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added interface is broken when PRINTK is disabled:
> 
> drivers/tty/sysrq.c: In function '__handle_sysrq':
> drivers/tty/sysrq.c:601:9: error: implicit declaration of function 'printk_force_console_enter' [-Wimplicit-function-declaration]
>   601 |         printk_force_console_enter();
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/tty/sysrq.c:611:25: error: implicit declaration of function 'printk_force_console_exit' [-Wimplicit-function-declaration]
>   611 |                         printk_force_console_exit();
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Add empty stub functions for both.

Does it compile with `make W=1` without warnings/errors? If so, I am okay with
the approach.

Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH] [v2] printk: add dummy printk_force_console_enter/exit helpers

[Marcos Paulo de Souza]

On Tue, 2024-11-12 at 15:29 +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added interface is broken when PRINTK is disabled:
> 
> drivers/tty/sysrq.c: In function '__handle_sysrq':
> drivers/tty/sysrq.c:601:9: error: implicit declaration of function
> 'printk_force_console_enter' [-Wimplicit-function-declaration]
>   601 |         printk_force_console_enter();
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/tty/sysrq.c:611:25: error: implicit declaration of function
> 'printk_force_console_exit' [-Wimplicit-function-declaration]
>   611 |                         printk_force_console_exit();
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Add empty stub functions for both.

Ouch, indeed, my fault. After disabling prinkt I saw the build errors.
Thanks for fixing it!

Reviewed-by: Marcos Paulo de Souza <mpdesouza@suse.com>
Tested-by: Marcos Paulo de Souza <mpdesouza@suse.com>

> 
> Fixes: ed76c07c6885 ("printk: Introduce FORCE_CON flag")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> v2: realized I sent the wrong version that was missing 'inline'.
> ---
>  include/linux/printk.h | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/include/linux/printk.h b/include/linux/printk.h
> index 232e5fd06701..4217a9f412b2 100644
> --- a/include/linux/printk.h
> +++ b/include/linux/printk.h
> @@ -232,6 +232,14 @@ static inline void printk_deferred_exit(void)
>  {
>  }
>  
> +static inline void printk_force_console_enter(void)
> +{
> +}
> +
> +static inline void printk_force_console_exit(void)
> +{
> +}
> +
>  static inline int printk_ratelimit(void)
>  {
>  	return 0;

Re: [PATCH] [v2] printk: add dummy printk_force_console_enter/exit helpers

[Petr Mladek]

On Tue 2024-11-12 15:29:15, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> The newly added interface is broken when PRINTK is disabled:
> 
> drivers/tty/sysrq.c: In function '__handle_sysrq':
> drivers/tty/sysrq.c:601:9: error: implicit declaration of function 'printk_force_console_enter' [-Wimplicit-function-declaration]
>   601 |         printk_force_console_enter();
>       |         ^~~~~~~~~~~~~~~~~~~~~~~~~~
> drivers/tty/sysrq.c:611:25: error: implicit declaration of function 'printk_force_console_exit' [-Wimplicit-function-declaration]
>   611 |                         printk_force_console_exit();
>       |                         ^~~~~~~~~~~~~~~~~~~~~~~~~
> 
> Add empty stub functions for both.
> 
> Fixes: ed76c07c6885 ("printk: Introduce FORCE_CON flag")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Thanks a lot for the fix!

I have just pushed it into printk/linux.git,
branch for-6.13-force-console.

Best Regards,
Petr