sysctl: Add CONFIG_PROC_SYSCTL guards for converter macros

Wrap sysctl converter macros with CONFIG_PROC_SYSCTL conditional
compilation. When CONFIG_PROC_SYSCTL is disabled, provide stub
implementations that return -ENOSYS to prevent link errors while
maintaining API compatibility.

This ensures converter macros are only compiled when procfs sysctl
support is enabled in the kernel configuration.

Signed-off-by: Joel Granados <joel.granados@kernel.org>
This commit is contained in:
Joel Granados 2025-12-05 11:18:43 +01:00
parent ac3d6a4b60
commit 6036dc03c3

View File

@ -73,6 +73,7 @@ extern const int sysctl_vals[];
#define SYSCTL_USER_TO_KERN(dir) (!!(dir))
#define SYSCTL_KERN_TO_USER(dir) (!dir)
#ifdef CONFIG_PROC_SYSCTL
#define SYSCTL_USER_TO_KERN_INT_CONV(name, u_ptr_op) \
int sysctl_user_to_kern_int_conv##name(const bool *negp, \
const unsigned long *u_ptr,\
@ -173,6 +174,48 @@ int do_proc_uint_conv##name(unsigned long *u_ptr, unsigned int *k_ptr, \
return 0; \
}
#else // CONFIG_PROC_SYSCTL
#define SYSCTL_USER_TO_KERN_INT_CONV(name, u_ptr_op) \
int sysctl_user_to_kern_int_conv##name(const bool *negp, \
const unsigned long *u_ptr,\
int *k_ptr) \
{ \
return -ENOSYS; \
}
#define SYSCTL_KERN_TO_USER_INT_CONV(name, k_ptr_op) \
int sysctl_kern_to_user_int_conv##name(bool *negp, \
unsigned long *u_ptr, \
const int *k_ptr) \
{ \
return -ENOSYS; \
}
#define SYSCTL_INT_CONV_CUSTOM(name, user_to_kern, kern_to_user, \
k_ptr_range_check) \
int do_proc_int_conv##name(bool *negp, unsigned long *u_ptr, int *k_ptr,\
int dir, const struct ctl_table *tbl) \
{ \
return -ENOSYS; \
}
#define SYSCTL_USER_TO_KERN_UINT_CONV(name, u_ptr_op) \
int sysctl_user_to_kern_uint_conv##name(const unsigned long *u_ptr,\
unsigned int *k_ptr) \
{ \
return -ENOSYS; \
}
#define SYSCTL_UINT_CONV_CUSTOM(name, user_to_kern, kern_to_user, \
k_ptr_range_check) \
int do_proc_uint_conv##name(unsigned long *u_ptr, unsigned int *k_ptr, \
int dir, const struct ctl_table *tbl) \
{ \
return -ENOSYS; \
}
#endif // CONFIG_PROC_SYSCTL
extern const unsigned long sysctl_long_vals[];