From: Hui Su <sh_def@163.com>
Date: Wed, 16 Dec 2020 04:42:52 +0000 (-0800)
Subject: kernel/acct.c: use #elif instead of #end and #elif
X-Git-Tag: v5.10.235~82
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a96692f06440a413ae3dd735b4b7510a9a7ad8b6;p=thirdparty%2Fkernel%2Fstable.git

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>
---

diff --git a/kernel/acct.c b/kernel/acct.c
index 6552eb22dd1e4..a7e29ca8f3591 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
  */
@@ -516,8 +514,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;