Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp1365791pxx; Fri, 30 Oct 2020 08:23:19 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzsBruxDWIZmElvzc8wRzsJ9SGgM6RFLtZp18HWrgms0ck5DC1dyWEtSp0bGsfjYItPSGDW X-Received: by 2002:aa7:dac4:: with SMTP id x4mr2883762eds.165.1604071399106; Fri, 30 Oct 2020 08:23:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1604071399; cv=none; d=google.com; s=arc-20160816; b=aBPDLRjXF8JSHv06/zjxYLgO+YKsyc6wZN9sURnb4ZMlGjn6p5liKYAeO7mZnLywww IaYugV9qjn4ab9qTTNLLgyZOs1ut1Wn8i47ySKlzANw9TDtQmq/HZo03hqS+1z4doDhM QkN/Iqeveqd029DUtMv6P1VUAsOcvDDKfgdc6gSJ/AXmc8E/BKGHFiWcLC/QNfhmnW30 pULpcYVT9KgJT3SXifWNmzgcmGot2lMbrcwzMItTrxIxPe8lvQK42isKPuNVlTDX+Jrt kKEQZhnB7v9IEB8zkl3CmVAANxV00Zufyjy7sqqiQ5M0G/BIKYpBYzkQN4gBsvhADG1n S6Rg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=XtMUcZsmd5jEw0IBEDaFqCnSx4dDmd3DPFHD8fW6Sw8=; b=uQUxocqpgbbqi92Nqgi3zxwFFEFQM7icaT4uJcOGmQpt7FmBk6VWoTEP8vBT2LWdzP 2Jun0l5W5RDJsbFPyWvwrv8RV1kOz3NmMBZzwaO4ebK9JXKKuGXkyGmA4diJmJPGd0c7 X9QsI+AvlJVfmxWu+gYJlVBuQ09Jd26r73FWbXpJkAfimgDj23iB8GICshZOw6VANLxU Kq3uquLLUslwdsVscokPm7jmLi3e3/ZWN3W9vhHbrZLbwDTWHOvgwLgF0ZmWXOS2CtTG dUzUR0xKXOQwFwZD+JED6denVC/0GkrwJjSZJa7KPAHl0Hxoq6w+QAxtTobJD8SshOAy SNcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=jhb1OIn1; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id w3si3712007edf.354.2020.10.30.08.22.56; Fri, 30 Oct 2020 08:23:19 -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; dkim=pass header.i=@kernel.org header.s=default header.b=jhb1OIn1; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727149AbgJ3PUt (ORCPT + 99 others); Fri, 30 Oct 2020 11:20:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:52708 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726674AbgJ3PUB (ORCPT ); Fri, 30 Oct 2020 11:20:01 -0400 Received: from localhost.localdomain (HSI-KBW-46-223-126-90.hsi.kabel-badenwuerttemberg.de [46.223.126.90]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 2D39820756; Fri, 30 Oct 2020 15:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604071127; bh=iDfeVQLWc0H76d65dMCO1CjztYPtBiAdqFL9uiIlkxA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jhb1OIn10HVnUycRJeZeUqhvjqY7b4mZX550t1143M1pIBYLmQQr0nzbiZElXNTXc bYTQ0X2dUf+nNTz58NXmdjsqCiSPXs5uSCmOEw7151a70EDxo3by7tfJNhBu9i2yER 0eNneQ49BRZzFLRnGlBHU9e+toxVifn5GrJivi9I= From: Arnd Bergmann To: linux-kernel@vger.kernel.org Cc: Thomas Gleixner , Arnd Bergmann , Russell King , Tony Luck , Fenghua Yu , Greg Ungerer , Finn Thain , Philip Blundell , Joshua Thompson , Sam Creasey , "James E.J. Bottomley" , Helge Deller , Daniel Lezcano , John Stultz , Stephen Boyd , Linus Walleij , linux-ia64@vger.kernel.org, Parisc List , linux-m68k , Linux ARM Subject: [PATCH v2 06/15] ARM: rpc: use legacy_timer_tick Date: Fri, 30 Oct 2020 16:17:49 +0100 Message-Id: <20201030151758.1241164-7-arnd@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201030151758.1241164-1-arnd@kernel.org> References: <20201030151758.1241164-1-arnd@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann rpc is the only user of the timer_tick() function now, and can just call the newly added generic version instead. Reviewed-by: Linus Walleij Signed-off-by: Arnd Bergmann --- arch/arm/Kconfig | 1 + arch/arm/include/asm/mach/time.h | 2 -- arch/arm/kernel/time.c | 14 -------------- arch/arm/mach-rpc/time.c | 2 +- 4 files changed, 2 insertions(+), 17 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1b9fda08b92f..dbadfa186f72 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -452,6 +452,7 @@ config ARCH_RPC select HAVE_IDE select HAVE_PATA_PLATFORM select ISA_DMA_API + select LEGACY_TIMER_TICK select NEED_MACH_IO_H select NEED_MACH_MEMORY_H select NO_IOPORT_MAP diff --git a/arch/arm/include/asm/mach/time.h b/arch/arm/include/asm/mach/time.h index d75d39280db7..5f522916ec99 100644 --- a/arch/arm/include/asm/mach/time.h +++ b/arch/arm/include/asm/mach/time.h @@ -7,8 +7,6 @@ #ifndef __ASM_ARM_MACH_TIME_H #define __ASM_ARM_MACH_TIME_H -extern void timer_tick(void); - typedef void (*clock_access_fn)(struct timespec64 *); extern int register_persistent_clock(clock_access_fn read_persistent); diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 09b149b09c43..b3836c94dc74 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -60,20 +60,6 @@ unsigned long profile_pc(struct pt_regs *regs) EXPORT_SYMBOL(profile_pc); #endif -#ifndef CONFIG_GENERIC_CLOCKEVENTS -/* - * Kernel system timer support. - */ -void timer_tick(void) -{ - profile_tick(CPU_PROFILING); - xtime_update(1); -#ifndef CONFIG_SMP - update_process_times(user_mode(get_irq_regs())); -#endif -} -#endif - static void dummy_clock_access(struct timespec64 *ts) { ts->tv_sec = 0; diff --git a/arch/arm/mach-rpc/time.c b/arch/arm/mach-rpc/time.c index da85cac761ba..9f8edcfe9357 100644 --- a/arch/arm/mach-rpc/time.c +++ b/arch/arm/mach-rpc/time.c @@ -81,7 +81,7 @@ static irqreturn_t ioc_timer_interrupt(int irq, void *dev_id) { ioc_time += RPC_LATCH; - timer_tick(); + legacy_timer_tick(1); return IRQ_HANDLED; } -- 2.27.0