[1/2] kallsyms: fix building without printk

Message ID 20171113165146.2287420-1-arnd@arndb.de
State New
Headers show
Series
  • [1/2] kallsyms: fix building without printk
Related show

Commit Message

Arnd Bergmann Nov. 13, 2017, 4:50 p.m.
Building kallsyms fails without CONFIG_PRINTK due to a missing
declaration:

kernel/kallsyms.c: In function 'kallsyms_show_value':
kernel/kallsyms.c:670:10: error: 'kptr_restrict' undeclared (first use in this function); did you mean 'keyring_restrict'?

This moves the declaration outside of the #ifdef guard, the definition
is already available without CONFIG_PRINTK.

Fixes: c0f3ea158939 ("stop using '%pK' for /proc/kallsyms pointer values")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

---
 include/linux/printk.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

-- 
2.9.0

Comments

Sergey Senozhatsky Nov. 14, 2017, 1:28 a.m. | #1
On (11/13/17 17:50), Arnd Bergmann wrote:
> Building kallsyms fails without CONFIG_PRINTK due to a missing

> declaration:

> 

> kernel/kallsyms.c: In function 'kallsyms_show_value':

> kernel/kallsyms.c:670:10: error: 'kptr_restrict' undeclared (first use in this function); did you mean 'keyring_restrict'?

> 

> This moves the declaration outside of the #ifdef guard, the definition

> is already available without CONFIG_PRINTK.

>

> Fixes: c0f3ea158939 ("stop using '%pK' for /proc/kallsyms pointer values")

> Signed-off-by: Arnd Bergmann <arnd@arndb.de>


ah, I see what happened. was confused at first, because we
do !PRINTK build tests.

FWIW,
Reviewed-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>


thanks.

	-ss

> ---

>  include/linux/printk.h | 3 ++-

>  1 file changed, 2 insertions(+), 1 deletion(-)

> 

> diff --git a/include/linux/printk.h b/include/linux/printk.h

> index fbb75cac9028..e9b603ee9953 100644

> --- a/include/linux/printk.h

> +++ b/include/linux/printk.h

> @@ -187,7 +187,6 @@ extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,

>  

>  extern int printk_delay_msec;

>  extern int dmesg_restrict;

> -extern int kptr_restrict;

>  

>  extern int

>  devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,

> @@ -278,6 +277,8 @@ static inline void printk_safe_flush_on_panic(void)

>  }

>  #endif

>  

> +extern int kptr_restrict;

> +

>  extern asmlinkage void dump_stack(void) __cold;

>  

>  #ifndef pr_fmt

> -- 

> 2.9.0

>

Patch

diff --git a/include/linux/printk.h b/include/linux/printk.h
index fbb75cac9028..e9b603ee9953 100644
--- a/include/linux/printk.h
+++ b/include/linux/printk.h
@@ -187,7 +187,6 @@  extern bool printk_timed_ratelimit(unsigned long *caller_jiffies,
 
 extern int printk_delay_msec;
 extern int dmesg_restrict;
-extern int kptr_restrict;
 
 extern int
 devkmsg_sysctl_set_loglvl(struct ctl_table *table, int write, void __user *buf,
@@ -278,6 +277,8 @@  static inline void printk_safe_flush_on_panic(void)
 }
 #endif
 
+extern int kptr_restrict;
+
 extern asmlinkage void dump_stack(void) __cold;
 
 #ifndef pr_fmt