summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHui Su <sh_def@163.com>2020-12-16 05:42:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-16 07:46:15 +0100
commit35189b8ff18ee0c6f7c04f4c674584d1149d5c55 (patch)
treea85aa454dc66140f2a7454b209c1665068da27bf
parentkernel.h: split out mathematical helpers (diff)
downloadlinux-35189b8ff18ee0c6f7c04f4c674584d1149d5c55.tar.xz
linux-35189b8ff18ee0c6f7c04f4c674584d1149d5c55.zip
kernel/acct.c: use #elif instead of #end and #elif
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>
-rw-r--r--kernel/acct.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/acct.c b/kernel/acct.c
index f175df8f6aa4..a64102be2bb0 100644
--- a/kernel/acct.c
+++ b/kernel/acct.c
@@ -381,9 +381,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
*/
@@ -500,8 +498,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;