Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp342700pxk; Thu, 1 Oct 2020 04:00:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzqRDUf8v8uZMowY51s+hnMmVjnYICohUHR9otDKYg5AsssuVdBJJUhzMOPB55LoZQZzxon X-Received: by 2002:aa7:d30f:: with SMTP id p15mr4506104edq.256.1601550052947; Thu, 01 Oct 2020 04:00:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1601550052; cv=none; d=google.com; s=arc-20160816; b=G13lisfpJbvaQfw8jKObU9g1a77+ZHQsYugczIBzD9yMtRDJnM+AOdydzN/h3gtGmI zF/fiporSRt4fKXyuo7Nv2qzbGweI461jnijN8vBA1V4oQSlpnRuRmkJU5OpqT+/KIqJ mIJ01GvvWmvPi3gZ7rqkD8wiCi9R7ddyXGPEMEZUwJ37WrWPj2dz3oxalk+5N39BVhBo clS2yV82+yDjB77HfklY6bpTD7JNyhjwClE9h4ESzpbwgoWfUlHcb2d7PWMgxN4708ze MQnFZcwgIHGMS7i/X9WaiO7ld8jBfI3DqXdRZAuH3dVTuqjhIZ7snHxIJwfTPkL0dH+G WgDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:date:cc:to:subject:from:message-id; bh=fcSw3vVuUJpJGry2G2nGxSfn/8mqvulQ/1ymmKy3hAM=; b=w+m/gEbb3HqfrYXo6+X+c7S2eRpiUt51fqvAwcV+r63K/sMxtwuyykLaZKLJpeyuiM eztkJHb4csceIJIfqO0d/REyteL8MP6fVpucHZeu9cXFG/QclGGd+hvFent4Gg1/VilI NfYYK1+wHkEusIom86nPfD2X1iSOw4qivjLeEK6RsWaiWS1qJf2uk2n/W3O09LO2hiWW 82d7TLGdnOcL7eA8ajydx6q9PKp+Pa3hQ4r+vVM5f9XqqUnwH/n1Isz+ylzZ2pwS1B8k dbdCw6GfhS1QaCuz+ZzeEM4he9yiU4Oihk/uoyUvvmB5xI+NeGvVcyEFjIyQ51/prFaj kr2w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d14si3101690edz.294.2020.10.01.04.00.29; Thu, 01 Oct 2020 04:00:52 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732200AbgJAK7Z (ORCPT + 99 others); Thu, 1 Oct 2020 06:59:25 -0400 Received: from pegase1.c-s.fr ([93.17.236.30]:3119 "EHLO pegase1.c-s.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731888AbgJAK7Y (ORCPT ); Thu, 1 Oct 2020 06:59:24 -0400 Received: from localhost (mailhub1-int [192.168.12.234]) by localhost (Postfix) with ESMTP id 4C299h2c1qz9vCy8; Thu, 1 Oct 2020 12:59:20 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at c-s.fr Received: from pegase1.c-s.fr ([192.168.12.234]) by localhost (pegase1.c-s.fr [192.168.12.234]) (amavisd-new, port 10024) with ESMTP id 4NcroDXAJwLL; Thu, 1 Oct 2020 12:59:20 +0200 (CEST) Received: from messagerie.si.c-s.fr (messagerie.si.c-s.fr [192.168.25.192]) by pegase1.c-s.fr (Postfix) with ESMTP id 4C299h1Lblz9vCyC; Thu, 1 Oct 2020 12:59:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by messagerie.si.c-s.fr (Postfix) with ESMTP id CA4E68B903; Thu, 1 Oct 2020 12:59:21 +0200 (CEST) X-Virus-Scanned: amavisd-new at c-s.fr Received: from messagerie.si.c-s.fr ([127.0.0.1]) by localhost (messagerie.si.c-s.fr [127.0.0.1]) (amavisd-new, port 10023) with ESMTP id hzS0rJlOZJcq; Thu, 1 Oct 2020 12:59:21 +0200 (CEST) Received: from po17688vm.idsi0.si.c-s.fr (unknown [192.168.4.90]) by messagerie.si.c-s.fr (Postfix) with ESMTP id 1C8F68B975; Thu, 1 Oct 2020 12:59:21 +0200 (CEST) Received: by po17688vm.idsi0.si.c-s.fr (Postfix, from userid 0) id EFEA165ED8; Thu, 1 Oct 2020 10:59:20 +0000 (UTC) Message-Id: From: Christophe Leroy Subject: [PATCH] powerpc/time: Remove ifdef in get_vtb() To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Date: Thu, 1 Oct 2020 10:59:20 +0000 (UTC) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org SPRN_VTB and CPU_FTR_ARCH_207S are always defined, no need of an ifdef. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/time.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/include/asm/time.h b/arch/powerpc/include/asm/time.h index cb326720a8a1..6c663a382a75 100644 --- a/arch/powerpc/include/asm/time.h +++ b/arch/powerpc/include/asm/time.h @@ -80,10 +80,9 @@ static inline u64 get_rtc(void) static inline u64 get_vtb(void) { -#ifdef CONFIG_PPC_BOOK3S_64 if (cpu_has_feature(CPU_FTR_ARCH_207S)) return mfspr(SPRN_VTB); -#endif + return 0; } -- 2.25.0