[PATCH v3 1/6] printk: sysctl: use unsigned int for printk_delay
Andrew Murray <[email protected]>
| Newsgroups | dev.linux.lists.linux-rt-devel,org.infradead.lists.linux-arm-kernel,org.kernel.vger.linux-doc,org.kernel.vger.linux-kernel |
|---|---|
| Message-ID | <[email protected]> |
As the printk_delay sysctl represents a duration in milliseconds, let's set its type to be unsigned int. Signed-off-by: Andrew Murray <[email protected]> --- include/linux/printk.h | 2 +- kernel/printk/printk.c | 4 ++-- kernel/printk/sysctl.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/linux/printk.h b/include/linux/printk.h index f594c1266bfd411f2238b45374e8a71222f0407c..ea52dc72b73b64898f82a0319b01c27323b18dee 100644 --- a/include/linux/printk.h +++ b/include/linux/printk.h @@ -188,7 +188,7 @@ extern int __printk_ratelimit(const char *func); extern bool printk_timed_ratelimit(unsigned long *caller_jiffies, unsigned int interval_msec); -extern int printk_delay_msec; +extern unsigned int printk_delay_msec; extern int dmesg_restrict; extern void wake_up_klogd(void); diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c index 2fe9a963c823a41e7df10c29939a2abb55462859..31aabdf8248cc39c54ee11685d4a37deac1c174c 100644 --- a/kernel/printk/printk.c +++ b/kernel/printk/printk.c @@ -2117,14 +2117,14 @@ static u8 *__printk_recursion_counter(void) local_irq_restore(flags); \ } while (0) -int printk_delay_msec __read_mostly; +unsigned int printk_delay_msec __read_mostly; static inline void printk_delay(int level) { boot_delay_msec(level); if (unlikely(printk_delay_msec)) { - int m = printk_delay_msec; + unsigned int m = printk_delay_msec; while (m--) { mdelay(1); diff --git a/kernel/printk/sysctl.c b/kernel/printk/sysctl.c index f15732e93c2e9c0865c42e4af9cb6458d4402c0a..56c3db63b3f8c6c5fddc4e4de1f41c6102f0f4b1 100644 --- a/kernel/printk/sysctl.c +++ b/kernel/printk/sysctl.c @@ -44,9 +44,9 @@ static const struct ctl_table printk_sysctls[] = { { .procname = "printk_delay", .data = &printk_delay_msec, - .maxlen = sizeof(int), + .maxlen = sizeof(unsigned int), .mode = 0644, - .proc_handler = proc_dointvec_minmax, + .proc_handler = proc_douintvec_minmax, .extra1 = SYSCTL_ZERO, .extra2 = (void *)&ten_thousand, }, -- 2.34.1