From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9BA0C433DF for ; Thu, 15 Oct 2020 17:46:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 68ECD22264 for ; Thu, 15 Oct 2020 17:46:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="mT98cD3/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726830AbgJORqT (ORCPT ); Thu, 15 Oct 2020 13:46:19 -0400 Received: from m12-12.163.com ([220.181.12.12]:55526 "EHLO m12-12.163.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725922AbgJORqT (ORCPT ); Thu, 15 Oct 2020 13:46:19 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=Date:From:Subject:Message-ID:MIME-Version; bh=XN9H2 NxW6U+e1Qg/wOmyXlcxurDEZ/tcQC1sO6RyP+k=; b=mT98cD3/kTxfYXfjTD9J2 6kKF9FWRalRzyDAgJezJoix2UPMoGiF7G/H7okemV6TFSgOwOpe1qCcoTLOlp9Ay VtxInKaN9UMa4BgtXXa8m3hFFUBPYAB1yWtqmg9JUhgRB4OFyYqlvGt8PixaQepr 01AIWU4HzE3PoIAVw+JRvw= Received: from localhost (unknown [101.228.30.83]) by smtp8 (Coremail) with SMTP id DMCowAB3nwS4ZYhfVlTERw--.36972S2; Thu, 15 Oct 2020 23:07:36 +0800 (CST) Date: Thu, 15 Oct 2020 23:07:36 +0800 From: Hui Su To: akpm@linux-foundation.org, daniel.m.jordan@oracle.com, walken@google.com, vbabka@suse.cz, ldufour@linux.ibm.com, arnd@arndb.de, sh_def@163.com, linux-kernel@vger.kernel.org Subject: [PATCH] acct.c: use #elif instead of #end and #elif Message-ID: <20201015150736.GA91603@rlk> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline X-CM-TRANSID: DMCowAB3nwS4ZYhfVlTERw--.36972S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrZFy3KryUGw4UGw1UJF1fWFg_yoW3ZFg_ua 1Fqr18CF15Ar1rAr929ws5ArWfW3y8XF4v9w17Kay7Za1DAwn5Xw1DArn293sa9397GFy3 urn8CFnxGrn2yjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7xRi1CJJUUUUU== X-Originating-IP: [101.228.30.83] X-CM-SenderInfo: xvkbvvri6rljoofrz/1tbiIBi+X10TBw9RrAAAsi Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use #elif instead of #end and #elif. Signed-off-by: Hui Su --- kernel/acct.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/kernel/acct.c b/kernel/acct.c index b0c5b3a9f5af..24681372af07 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; -- 2.25.1