diff options
| author | Hui Su <sh_def@163.com> | 2020-12-15 20:42:52 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-03-13 12:43:26 +0100 |
| commit | 1b18a0118cc6545dca66e9d90b04e1e244d2601c (patch) | |
| tree | 06666de55bb0780806dc27671891a6b384141124 /kernel | |
| parent | 6e9e0f224ffd8b819da3ea247dda404795fdd182 (diff) | |
| download | linux-1b18a0118cc6545dca66e9d90b04e1e244d2601c.tar.gz linux-1b18a0118cc6545dca66e9d90b04e1e244d2601c.tar.bz2 linux-1b18a0118cc6545dca66e9d90b04e1e244d2601c.zip | |
kernel/acct.c: use #elif instead of #end and #elif
[ Upstream commit 35189b8ff18ee0c6f7c04f4c674584d1149d5c55 ]
Cleanup: use #elif instead of #end and #elif.
Link: https://lkml.kernel.org/r/20201015150736.GA91603@rlk
Signed-off-by: Hui Su <sh_def@163.com>
Reviewed-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Stable-dep-of: 56d5f3eba3f5 ("acct: perform last write from workqueue")
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/acct.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/acct.c b/kernel/acct.c index a98ce49d12fa..79f93a45973f 100644 --- a/kernel/acct.c +++ b/kernel/acct.c @@ -397,9 +397,7 @@ static comp2_t encode_comp2_t(u64 value) return (value & (MAXFRACT2>>1)) | (exp << (MANTSIZE2-1)); } } -#endif - -#if ACCT_VERSION == 3 +#elif ACCT_VERSION == 3 /* * encode an u64 into a 32 bit IEEE float */ @@ -514,8 +512,7 @@ static void do_acct_process(struct bsd_acct_struct *acct) /* backward-compatible 16 bit fields */ ac.ac_uid16 = ac.ac_uid; ac.ac_gid16 = ac.ac_gid; -#endif -#if ACCT_VERSION == 3 +#elif ACCT_VERSION == 3 { struct pid_namespace *ns = acct->ns; |