From patchwork Fri Apr 16 20:35:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jian Cai X-Patchwork-Id: 12208747 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=-20.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING, MISSING_HEADERS,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 6D222C433B4 for ; Fri, 16 Apr 2021 20:37:44 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D62A660FEA for ; Fri, 16 Apr 2021 20:37:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D62A660FEA Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:Cc:From:Subject:References:Mime-Version:Message-Id: In-Reply-To:Date:Reply-To:To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=/+Y/1Jj+GOd81pf0VnhrNdTbrbjioDkcL6UATfW7dK4=; b=Kaq0mOEM6vLLs7+x+Vow5LHcx JCumefnvVK/43AjqOU7Xu5cYxhbpSQArNHXY3iuMjU/3vDtbTsMj1oiHrJgkzNfWHR4zh7zg60CS0 wcNBZV3KH/1Nvouj6wYTGieDeaACzVO1IoW+BsUIrgzijgRKaJWRrmZ+qkfpMPSj8XtuLB72FT5KX vRytKcMT7LqsbzUT1CdwT1UWc+PKqD1m/jfsPX0DykehxLvDYS6UBE59int36eoII/LLiinPAWUhi TlpWNaogrNYgkXWq/O0EmMD7Y3Rtm31RrlGdFP2b7TsUejSp30O3v3NOREZBn92Z+LanKPA0l6R8O KbAGLkr5Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lXVBe-003MPu-TF; Fri, 16 Apr 2021 20:35:35 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXVBa-003MPR-S8 for linux-arm-kernel@desiato.infradead.org; Fri, 16 Apr 2021 20:35:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To:To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Q8aau1UBqJXGOugSq4JjsK2GmL5sgcCnZiQBPgmr8g8=; b=zOV2RDKNkKQvHrjAg4/X17Fr9V SmEYpzAgfGaxuhzSEJn7u0YWZLAbG0cO5DCfk3eE1ICdGpug9XeiG/8ZuutjJNEGalInxwdG5r5l9 lpJraj0T2V83qGlI2fto7au2oUP5XxF08aKDZu1AvgauyfncmUqXWE6Xu6Q1ALr5wdJCykNf/d6rb LEVbjNC3ktd22uWC2NoQMTWMaqia9TzKXXAckvVX4wXleiRqKRqA/Yfm8EhWr6+kw/IBZeLq8J8nk EYJok9tOZQyBUW7MiWhcHQOky1HgvV0jRTTfqZROc2zv2GlWXwohj1+VgmUPhdKeB4wWg7OvHIOCD xXPc8z5w==; Received: from mail-qk1-x74a.google.com ([2607:f8b0:4864:20::74a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lXVBX-009gXl-MW for linux-arm-kernel@lists.infradead.org; Fri, 16 Apr 2021 20:35:29 +0000 Received: by mail-qk1-x74a.google.com with SMTP id p27so4513273qkj.14 for ; Fri, 16 Apr 2021 13:35:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=Q8aau1UBqJXGOugSq4JjsK2GmL5sgcCnZiQBPgmr8g8=; b=sV4uzzHjkUs767u8LSJDe2EEyB8nEWkAdKuccwVxsSuKhlm+K0SrC9kAfpfS0J3B5A 8/F4pJIh/JBrv1dtYN+MyibvnL1iMLoytfTG9GyNCkzvFHJG1J9iTrT2wOTAUhsMdrwY D6+FY4M0G2f2wXZzXhMn48tVjxymClzfdy4sKCFUKEkvptF/EEWg5qd4ujGJBmuoyz7U eAPszhi+dxgmH1ntQ/7IFHyNTMQFJlCDiDMvKxRuQ+fvT1ezshHnx0CVhIehOrMaa3jM nV3h6ITf1jtfB2m5KP1lC4yp1CRs+vg1ySfN6ua4njHZDgVC1w0BDoLaEeKoGwxnljZW GQcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=Q8aau1UBqJXGOugSq4JjsK2GmL5sgcCnZiQBPgmr8g8=; b=rzjxkQgSEt0CEnHM2p20Sp6+ET5+XN4cQUcszd5GUCAHqQXSHmPwGQa8roaiNtVgHl 416a8Em/ORzW5IW892s4S2hdDreUq+h6tUD597X3Wo68nR9X1BHzPfVibzxVG0yzl8pM nBTFGMdlSLRGJSf6CLds4P9rJTAl1HKmwKv+tTYyqDfQEQv8UJNOlVLjBbeV784xzfx8 A5+JiEioL30bh8dcIorhqUkeREHAjF/Fw0aPYJe/tqrEI4sSe4rdM8ymzOhq1m9Fuee5 RJ95hTtuZvAAFvwjutCdtLM3fuAk/2gn5WuPi0poBQAcOB7T4Ip8Jr8Ti52QpQ01/aaL VZHg== X-Gm-Message-State: AOAM533lO6n3u8DF0TOlHiVGk23iVLrSFsCtajdW3CTc8wDTc9J05wRx 0Dj4akd2ezA+9gwig5kn40nABrqPKAvZ X-Google-Smtp-Source: ABdhPJzvyYpeO+bjD50fx+JSx7mt0QB2dcO4rSN29yNXOgFwiiVFWiAn0/Q2yZCLnvhRfbXv7sKNr4v7ZWe6 X-Received: from jiancai.svl.corp.google.com ([2620:15c:2ce:0:a547:67f6:5e32:5814]) (user=jiancai job=sendgmr) by 2002:a0c:c707:: with SMTP id w7mr10808461qvi.11.1618605325023; Fri, 16 Apr 2021 13:35:25 -0700 (PDT) Date: Fri, 16 Apr 2021 13:35:21 -0700 In-Reply-To: <20210416181421.2374588-1-jiancai@google.com> Message-Id: <20210416203522.2397801-1-jiancai@google.com> Mime-Version: 1.0 References: <20210416181421.2374588-1-jiancai@google.com> X-Mailer: git-send-email 2.31.1.368.gbe11c130af-goog Subject: [PATCH v2] arm64: vdso: remove commas between macro name and arguments From: Jian Cai Cc: stable@vger.kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org, ndesaulniers@google.com, natechancellor@gmail.com, manojgupta@google.com, llozano@google.com, clang-built-linux@googlegroups.com, Jian Cai , Ard Biesheuvel , Catalin Marinas , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210416_133527_774689_9DB54B5F X-CRM114-Status: GOOD ( 11.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org LLVM's integrated assembler does not support using commas separating the name and arguments in .macro. However, only spaces are used in the manual page. This replaces commas between macro names and the subsequent arguments with space in calls to clock_gettime_return to make it compatible with IAS. Link: https://sourceware.org/binutils/docs/as/Macro.html#Macro https://github.com/ClangBuiltLinux/linux/issues/1349 Suggested-by: Ard Biesheuvel Signed-off-by: Jian Cai --- Changes v1 -> v2: Keep the comma in the macro definition to be consistent with other definitions. arch/arm64/kernel/vdso/gettimeofday.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/vdso/gettimeofday.S b/arch/arm64/kernel/vdso/gettimeofday.S index 856fee6d3512..b6faf8b5d1fe 100644 --- a/arch/arm64/kernel/vdso/gettimeofday.S +++ b/arch/arm64/kernel/vdso/gettimeofday.S @@ -227,7 +227,7 @@ realtime: seqcnt_check fail=realtime get_ts_realtime res_sec=x10, res_nsec=x11, \ clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN monotonic: @@ -250,7 +250,7 @@ monotonic: clock_nsec=x15, xtime_sec=x13, xtime_nsec=x14, nsec_to_sec=x9 add_ts sec=x10, nsec=x11, ts_sec=x3, ts_nsec=x4, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN monotonic_raw: @@ -271,7 +271,7 @@ monotonic_raw: clock_nsec=x15, nsec_to_sec=x9 add_ts sec=x10, nsec=x11, ts_sec=x13, ts_nsec=x14, nsec_to_sec=x9 - clock_gettime_return, shift=1 + clock_gettime_return shift=1 ALIGN realtime_coarse: