diff options
| author | Ingo Molnar <[email protected]> | 2024-01-08 11:57:28 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2024-01-08 11:57:28 +0000 |
| commit | cdb3033e191fd03da2d7da23b9cd448dfa180a8e (patch) | |
| tree | e863d55e63bea2bc9c18652e0d7291fec5e5cd23 /security/keys/proc.c | |
| parent | sched/fair: Remove unused 'next_buddy_marked' local variable in check_preempt... (diff) | |
| parent | sched/fair: Fix tg->load when offlining a CPU (diff) | |
| download | kernel-cdb3033e191fd03da2d7da23b9cd448dfa180a8e.tar.gz kernel-cdb3033e191fd03da2d7da23b9cd448dfa180a8e.zip | |
Merge branch 'sched/urgent' into sched/core, to pick up pending v6.7 fixes for the v6.8 merge window
This fix didn't make it upstream in time, pick it up
for the v6.8 merge window.
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'security/keys/proc.c')
| -rw-r--r-- | security/keys/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/proc.c b/security/keys/proc.c index d0cde6685627..4f4e2c1824f1 100644 --- a/security/keys/proc.c +++ b/security/keys/proc.c @@ -198,7 +198,7 @@ static int proc_keys_show(struct seq_file *m, void *v) /* come up with a suitable timeout value */ expiry = READ_ONCE(key->expiry); - if (expiry == 0) { + if (expiry == TIME64_MAX) { memcpy(xbuf, "perm", 5); } else if (now >= expiry) { memcpy(xbuf, "expd", 5); |