From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936463AbcKPIc6 (ORCPT ); Wed, 16 Nov 2016 03:32:58 -0500 Received: from terminus.zytor.com ([198.137.202.10]:57678 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935195AbcKPIcx (ORCPT ); Wed, 16 Nov 2016 03:32:53 -0500 Date: Wed, 16 Nov 2016 00:32:35 -0800 From: tip-bot for Nicolas Pitre Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, nico@linaro.org, josh@joshtriplett.org, ecree@solarflare.com, pebolle@tiscali.nl, linux-kernel@vger.kernel.org, richardcochran@gmail.com, john.stultz@linaro.org, mmarek@suse.com, nicolas.pitre@linaro.org, mingo@kernel.org Reply-To: tglx@linutronix.de, hpa@zytor.com, nico@linaro.org, ecree@solarflare.com, pebolle@tiscali.nl, josh@joshtriplett.org, linux-kernel@vger.kernel.org, richardcochran@gmail.com, john.stultz@linaro.org, mmarek@suse.com, nicolas.pitre@linaro.org, mingo@kernel.org In-Reply-To: <1478841010-28605-5-git-send-email-nicolas.pitre@linaro.org> References: <1478841010-28605-5-git-send-email-nicolas.pitre@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] timer: Move sys_alarm from timer.c to itimer.c Git-Commit-ID: 74ba181e61c6accf9066d6980f44588de2f854f6 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 74ba181e61c6accf9066d6980f44588de2f854f6 Gitweb: http://git.kernel.org/tip/74ba181e61c6accf9066d6980f44588de2f854f6 Author: Nicolas Pitre AuthorDate: Fri, 11 Nov 2016 00:10:08 -0500 Committer: Thomas Gleixner CommitDate: Wed, 16 Nov 2016 09:26:34 +0100 timer: Move sys_alarm from timer.c to itimer.c Move the only user of alarm_setitimer to itimer.c where it is defined. This allows for making alarm_setitimer static, and dropping it from the build when __ARCH_WANT_SYS_ALARM is not defined. Signed-off-by: Nicolas Pitre Acked-by: John Stultz Cc: Paul Bolle Cc: linux-kbuild@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Richard Cochran Cc: Josh Triplett Cc: Michal Marek Cc: Edward Cree Link: http://lkml.kernel.org/r/1478841010-28605-5-git-send-email-nicolas.pitre@linaro.org Signed-off-by: Thomas Gleixner --- include/linux/time.h | 2 -- kernel/time/itimer.c | 15 ++++++++++++++- kernel/time/timer.c | 13 ------------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/include/linux/time.h b/include/linux/time.h index 4cea09d..23f0f5c 100644 --- a/include/linux/time.h +++ b/include/linux/time.h @@ -172,8 +172,6 @@ extern int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue); extern int do_getitimer(int which, struct itimerval *value); -extern unsigned int alarm_setitimer(unsigned int seconds); - extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags); struct tms; diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c index 1d5c720..2b9f45b 100644 --- a/kernel/time/itimer.c +++ b/kernel/time/itimer.c @@ -238,6 +238,8 @@ again: return 0; } +#ifdef __ARCH_WANT_SYS_ALARM + /** * alarm_setitimer - set alarm in seconds * @@ -250,7 +252,7 @@ again: * On 32 bit machines the seconds value is limited to (INT_MAX/2) to avoid * negative timeval settings which would cause immediate expiry. */ -unsigned int alarm_setitimer(unsigned int seconds) +static unsigned int alarm_setitimer(unsigned int seconds) { struct itimerval it_new, it_old; @@ -275,6 +277,17 @@ unsigned int alarm_setitimer(unsigned int seconds) return it_old.it_value.tv_sec; } +/* + * For backwards compatibility? This can be done in libc so Alpha + * and all newer ports shouldn't need it. + */ +SYSCALL_DEFINE1(alarm, unsigned int, seconds) +{ + return alarm_setitimer(seconds); +} + +#endif + SYSCALL_DEFINE3(setitimer, int, which, struct itimerval __user *, value, struct itimerval __user *, ovalue) { diff --git a/kernel/time/timer.c b/kernel/time/timer.c index 88aab86..42d27aa 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1662,19 +1662,6 @@ void run_local_timers(void) raise_softirq(TIMER_SOFTIRQ); } -#ifdef __ARCH_WANT_SYS_ALARM - -/* - * For backwards compatibility? This can be done in libc so Alpha - * and all newer ports shouldn't need it. - */ -SYSCALL_DEFINE1(alarm, unsigned int, seconds) -{ - return alarm_setitimer(seconds); -} - -#endif - static void process_timeout(unsigned long __data) { wake_up_process((struct task_struct *)__data);