diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-20 11:28:27 +0300 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-04-20 11:28:27 +0300 |
commit | 616e143c9fd88562b4d2cb235834c620fe65ba22 (patch) | |
tree | db2f3fc5db49af8cbc0cd4439cd19b44972d6f66 /arch/s390/mm/cmm.c | |
parent | 932316d50d55fc2815f352cc873c3143bfe54372 (diff) | |
parent | d12acd7bc3d4ca813dc2360e6f5ca6bb1682c290 (diff) | |
download | linux-616e143c9fd88562b4d2cb235834c620fe65ba22.tar.xz |
Merge v6.14.3
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/mm/cmm.c')
-rw-r--r-- | arch/s390/mm/cmm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c index d01724a715d0..39f44b6256e0 100644 --- a/arch/s390/mm/cmm.c +++ b/arch/s390/mm/cmm.c @@ -204,7 +204,7 @@ static void cmm_set_timer(void) del_timer(&cmm_timer); return; } - mod_timer(&cmm_timer, jiffies + msecs_to_jiffies(cmm_timeout_seconds * MSEC_PER_SEC)); + mod_timer(&cmm_timer, jiffies + secs_to_jiffies(cmm_timeout_seconds)); } static void cmm_timer_fn(struct timer_list *unused) @@ -332,7 +332,7 @@ static int cmm_timeout_handler(const struct ctl_table *ctl, int write, return 0; } -static struct ctl_table cmm_table[] = { +static const struct ctl_table cmm_table[] = { { .procname = "cmm_pages", .mode = 0644, |