From patchwork Sat Apr 10 18:11:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Edmundo Carmona Antoranz X-Patchwork-Id: 12195789 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=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 5EA56C433B4 for ; Sat, 10 Apr 2021 18:13:28 +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 EF7F060FF1 for ; Sat, 10 Apr 2021 18:13:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF7F060FF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.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:MIME-Version:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=1mHEOaC8+YJED4gpS3oA9hs7XxAbW87lx7Y46kBDmL8=; b=ATkFQP0DRq82U1+SVMvQkKLM6J 86yV2F1Yyt5p2q+ieLzlegAwgCOdhjDhClTT/jlHWycgnVzlXLDV/EdfeJaGsjGCbyahJF9Ldw90b EQnslQw5+oUP5YrT4Bq1vnNza0iTC7g6yCdrjSK7S/CW7ZRtblnxWXZE1YSZI9xVoHEAjCRrnXBmm i9eB7/81KzvBpUO0RVmLGbjmn6AcTXpY5bI8OjCuX6ext0uErvrbwUpGQezjhekTBm5Vrq6eyE0pB ZY46EPZ4exbur5q3l4dL9K2ccyTkrz/lcQ66YYn+G3nOzEr8Xv/5ifu3vcZdFUSPvRwmpWOZfIzak Xa9oDACA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lVI5E-003Eqd-16; Sat, 10 Apr 2021 18:11:48 +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 1lVI59-003EqX-Q7 for linux-arm-kernel@desiato.infradead.org; Sat, 10 Apr 2021 18:11:44 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=lQlPOR52GuZghxs8RduYzavBQkGz5NLwxN//OK6hnjw=; b=dEq7z6mRmqTaqe37TiZFUOjWsd nS+kVySvU6VnER5m5el8uWg/GgdXLZpKCJXg8seRPkXgT9nv8Srf22bHpblAbOqvL56UpeagJcJsK Qvc4s8vcfNmZyxv6MMVDS9oDP31LFop7AOr3l54CEzMhAItfaN3jFfltt6HJtt18KeD3MKCXNFORw +kN0vkXYm2HNiDUaTm4jbFe1fl0MMcg8u0XgC5b4f5/Pqh8dD/mONuGc4TOTIJkGKtzmfzWVxjUZZ gKghOoLnWNLqQIzrI4iS+y8BF5tfsw61C/0Awztisd1igaoN0FsqWrf3pDhNW1q+yVdONWqe95Ql7 7+p+M5lg==; Received: from mail-qk1-x72b.google.com ([2607:f8b0:4864:20::72b]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lVI57-005Cro-2E for linux-arm-kernel@lists.infradead.org; Sat, 10 Apr 2021 18:11:42 +0000 Received: by mail-qk1-x72b.google.com with SMTP id q26so9217379qkm.6 for ; Sat, 10 Apr 2021 11:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lQlPOR52GuZghxs8RduYzavBQkGz5NLwxN//OK6hnjw=; b=OvNcX5bkGhcWsU5OkkTcONorFNPDJQdh4ypOSt8glUgMV6L+BUNwDLoYZj7S12MxA7 NPch9/NsqVV3uRSnh0cJ+Yrn7RPv6qhtseGBj126xkAP5NEP01KZuyqJxFsG9U9rAQlu NNRZE+sw3C5X+RHuXZvRb/S2ZBRRuAbwluqFab7EUzbidxhyoGCnIzh4vPqCRiYYXIaD LCsSaG1psqxhJ8TJNqNVlNYLoWJG5V3PafyXnUurHbJQQ4v3wjJ4ItCd77Ni0zgb9qmy /c7qyc6T6vot9zkd0bG4L52iRY/5Pe8yoO27bi/fmhUQruhdzNLf9Cq04iJENl7ufTf8 SKEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=lQlPOR52GuZghxs8RduYzavBQkGz5NLwxN//OK6hnjw=; b=TDUlD/I2FmBdoVGb3iRFPKoH3kRqTpFtOs+4MjsCKYqZW8DZiTkKrHeAM4UXHA45Oy dqWr0hVgLZLhTSoNsKhLlPL1epJ6Ai6rjoQuHQaJOvSwaNis6OdxyDAmzJNrPn2NrDjk QekArc0EWVpRZzbSAMszQb6bcXP4wJaYXl45emocpvaM1Ji2s4N1efOxjB770KDGlUqz Feg5P/lKc1PP5CEAq+Mc9aDnPtysPDPOT/d6uAFPPg+JFbue88aJa/m4G5H6eK98VKsl i32aLRwWOoO4mxAFyeJ5v6dJfLq9mZ/fIJRc7asOGvMovr0D9P0RcISoK9icLme4e+mz Y+8g== X-Gm-Message-State: AOAM533XExFLla4F5SEbVUA4tosiEikXcjPHHchwFYPsNhHjQl9TmGEh MWHRzqb+zCmaa/+SFZMaBbQ= X-Google-Smtp-Source: ABdhPJxCv/Gh97H5qPnCJNQM7MR52k7oxTvLHYhxtNzO1iHIkfJ/T/7PCCNNSJk3SvqEjgTGDpeAGQ== X-Received: by 2002:a37:b947:: with SMTP id j68mr14035141qkf.108.1618078299279; Sat, 10 Apr 2021 11:11:39 -0700 (PDT) Received: from localhost.localdomain ([186.32.194.42]) by smtp.gmail.com with ESMTPSA id o125sm4362466qkf.87.2021.04.10.11.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Apr 2021 11:11:38 -0700 (PDT) From: Edmundo Carmona Antoranz To: catalin.marinas@arm.com, will@kernel.org, avagin@gmail.com, 0x7f454c46@gmail.com, mark.rutland@arm.com, maz@kernel.org, tglx@linutronix.de, linux-arm-kernel@lists.infradead.org Cc: kernel-janitors@vger.kernel.org, Edmundo Carmona Antoranz Subject: [PATCH -next] arm64: vdso: correct definition of macro vdso_clocksource_ok Date: Sat, 10 Apr 2021 12:11:17 -0600 Message-Id: <20210410181117.23967-1-eantoranz@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210410_111141_143863_D21E01AD X-CRM114-Status: GOOD ( 13.58 ) 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 The macro vdso_clocksource_ok is shadowing a function with the same name and so it actually makes no difference to have the macro defined or not. Take a hint from x86, rename the function to have the arch_ prefix and correct the definition of the macro. Signed-off-by: Edmundo Carmona Antoranz --- arch/arm64/include/asm/vdso/compat_gettimeofday.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/vdso/compat_gettimeofday.h b/arch/arm64/include/asm/vdso/compat_gettimeofday.h index 7508b0ac1d21..055d9e42a05d 100644 --- a/arch/arm64/include/asm/vdso/compat_gettimeofday.h +++ b/arch/arm64/include/asm/vdso/compat_gettimeofday.h @@ -166,11 +166,11 @@ static __always_inline const struct vdso_data *__arch_get_timens_vdso_data(void) } #endif -static inline bool vdso_clocksource_ok(const struct vdso_data *vd) +static inline bool arch_vdso_clocksource_ok(const struct vdso_data *vd) { return vd->clock_mode == VDSO_CLOCKMODE_ARCHTIMER; } -#define vdso_clocksource_ok vdso_clocksource_ok +#define vdso_clocksource_ok arch_vdso_clocksource_ok #endif /* !__ASSEMBLY__ */