Received: by 2002:a05:6a10:f347:0:0:0:0 with SMTP id d7csp9116402pxu; Mon, 28 Dec 2020 07:03:54 -0800 (PST) X-Google-Smtp-Source: ABdhPJxcT/z2P+AGIzsp++AYefIMWckSSxaJIjz8fk6RmaBW1gkzmU+yt+d2wnfOXF/NrxNwwr+m X-Received: by 2002:a17:906:27d1:: with SMTP id k17mr43001962ejc.325.1609167833824; Mon, 28 Dec 2020 07:03:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609167833; cv=none; d=google.com; s=arc-20160816; b=Xm7oTIHNhYUN3ZGKv2J2egi3RteKr2Cr7CCT4aAMd9+Wo14qhyY9rp9jElWYV5wLwR W9EmCdgJ/ig2CgIxv2gxZdGsQii5OnDB8ARlCGnfzlupWAg8hYcw6oP1l++9Qt2m/rJJ 076TjMgkBW+pk9gkj8E5fagWEKDR5FlaidNSbQNI8hXIeP7UCN6NgqYNimtXjLW3PIUn lyLSZZyTPYTtqiOHf6CUMu1N5dhbC1j5ZzmQT7FNteBHzmbyVI8MwkioB4ZzC29oGu9/ Ol5kiDxkx1oDgqw3C3zDj5+Vl28FEKRRcGMa7nUVjt8G1vC/qOXrz9TS/XkgeIYxLGQo JMyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=hojxY2qrIdvZHkFMJl9Dfq31lyvCRBGN89+FogVYvB0=; b=xUcFaKw3x7HyAA1pvTFGNS8lDFswG3JBOKG+N4e0OimImBUuYw4vLxOYFevLokeetb 9/gSqvElYgUDGsD2Sb6ypr0NEiH+7jMZxf98fmXDgdH3fIb2ZM73pZp2Yq0ixUYs03S4 rXjcqv7RdVze0UK9MA5sjb8YBxkl2IcPsieoBG7NOkSxx9Ue/XyXRe+CwsmTypFeBwgn 815xlto0Cmpcl1JcTTLCiOUm4dXD5jWurokZih8Cp7Kf+3AT3xa/ue4GOEcozFryWhor WNzBByW6AnyWlZcNpVdJ817Lf2KnP8O8LlNb0nakrBYT+DCtY+uk2tYGa0ABJhqDN08Q iIrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ncVEj7N7; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t4si20834608edq.607.2020.12.28.07.03.30; Mon, 28 Dec 2020 07:03:53 -0800 (PST) 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; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ncVEj7N7; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2440136AbgL1ONS (ORCPT + 99 others); Mon, 28 Dec 2020 09:13:18 -0500 Received: from mail.kernel.org ([198.145.29.99]:48172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2440126AbgL1ONR (ORCPT ); Mon, 28 Dec 2020 09:13:17 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E942F205CB; Mon, 28 Dec 2020 14:12:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1609164756; bh=sPBo56PnpmPEgFttFhFe+Y3njLhQr4aBpRxLiclgDFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ncVEj7N7MYKVRiGGF5Oe1XQU8Z0rBQMIyRyfS3zYLdtWGPFj3OSsifr4H4gQ59Nvq q76u0mUj8Rx/3ZeQNsTnZzMXLObZqIWopcgsyJy3w86bhrkNCH5lno08aF6FmihA2O qWappdRw6i35/8r1HOV8r+EjGZMpQOXG0mADjgv4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Kefeng Wang , Palmer Dabbelt , Daniel Lezcano , Sasha Levin Subject: [PATCH 5.10 288/717] clocksource/drivers/riscv: Make RISCV_TIMER depends on RISCV_SBI Date: Mon, 28 Dec 2020 13:44:46 +0100 Message-Id: <20201228125034.829402172@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228125020.963311703@linuxfoundation.org> References: <20201228125020.963311703@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Kefeng Wang [ Upstream commit ab3105446f1ec4e98fadfc998ee24feec271c16c ] The riscv timer is set via SBI timer call, let's make RISCV_TIMER depends on RISCV_SBI, and it also fixes some build issue. Fixes: d5be89a8d118 ("RISC-V: Resurrect the MMIO timer implementation for M-mode systems") Signed-off-by: Kefeng Wang Reviewed-by: Palmer Dabbelt Acked-by: Palmer Dabbelt Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20201028131230.72907-1-wangkefeng.wang@huawei.com Signed-off-by: Sasha Levin --- drivers/clocksource/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 68b087bff59cc..2be849bb794ac 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig @@ -654,7 +654,7 @@ config ATCPIT100_TIMER config RISCV_TIMER bool "Timer for the RISC-V platform" if COMPILE_TEST - depends on GENERIC_SCHED_CLOCK && RISCV + depends on GENERIC_SCHED_CLOCK && RISCV && RISCV_SBI select TIMER_PROBE select TIMER_OF help -- 2.27.0