From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael wang Subject: [PATCH 08/11] sched/cleanup: remove the extra parm of sched_clock_idle_wakeup_event() Date: Thu, 22 Aug 2013 15:57:56 +0800 Message-ID: <5215C484.5010407@linux.vnet.ibm.com> References: <5215C233.9060907@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from e23smtp04.au.ibm.com ([202.81.31.146]:53818 "EHLO e23smtp04.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753964Ab3HVH6G (ORCPT ); Thu, 22 Aug 2013 03:58:06 -0400 Received: from /spool/local by e23smtp04.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Aug 2013 17:41:05 +1000 In-Reply-To: <5215C233.9060907@linux.vnet.ibm.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: open list Cc: Ingo Molnar , Peter Zijlstra , x86@kernel.org, linux-acpi@vger.kernel.org, Thomas Gleixner , "H. Peter Anvin" , Len Brown , "Rafael J. Wysocki" , John Stultz , Paul Gortmaker , Feng Tang Parm 'delta_ns' has not been used, remove it to make code clean. CC: Thomas Gleixner CC: "H. Peter Anvin" CC: Len Brown CC: "Rafael J. Wysocki" CC: John Stultz CC: Paul Gortmaker CC: Feng Tang CC: Ingo Molnar CC: Peter Zijlstra Signed-off-by: Michael Wang --- arch/x86/kernel/tsc.c | 2 +- drivers/acpi/processor_idle.c | 4 ++-- include/linux/sched.h | 7 ++----- kernel/sched/clock.c | 2 +- kernel/time/tick-sched.c | 2 +- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 930e5d4..4a40402 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c @@ -635,7 +635,7 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu) (1UL << CYC2NS_SCALE_FACTOR)); } - sched_clock_idle_wakeup_event(0); + sched_clock_idle_wakeup_event(); local_irq_restore(flags); } diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c index f98dd00..2bb49f8 100644 --- a/drivers/acpi/processor_idle.c +++ b/drivers/acpi/processor_idle.c @@ -817,7 +817,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev, sched_clock_idle_sleep_event(); acpi_idle_do_entry(cx); - sched_clock_idle_wakeup_event(0); + sched_clock_idle_wakeup_event(); if (cx->entry_method != ACPI_CSTATE_FFH) current_thread_info()->status |= TS_POLLING; @@ -913,7 +913,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev, raw_spin_unlock(&c3_lock); } - sched_clock_idle_wakeup_event(0); + sched_clock_idle_wakeup_event(); if (cx->entry_method != ACPI_CSTATE_FFH) current_thread_info()->status |= TS_POLLING; diff --git a/include/linux/sched.h b/include/linux/sched.h index 45a1a88..800c57f 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1809,7 +1809,7 @@ static inline void sched_clock_idle_sleep_event(void) { } -static inline void sched_clock_idle_wakeup_event(u64 delta_ns) +static inline void sched_clock_idle_wakeup_event(void) { } #else @@ -1823,7 +1823,7 @@ extern int sched_clock_stable; extern void sched_clock_tick(void); extern void sched_clock_idle_sleep_event(void); -extern void sched_clock_idle_wakeup_event(u64 delta_ns); +extern void sched_clock_idle_wakeup_event(void); #endif #ifdef CONFIG_IRQ_TIME_ACCOUNTING @@ -1849,9 +1849,6 @@ extern void sched_exec(void); #define sched_exec() {} #endif -extern void sched_clock_idle_sleep_event(void); -extern void sched_clock_idle_wakeup_event(u64 delta_ns); - #ifdef CONFIG_HOTPLUG_CPU extern void idle_task_exit(void); #else diff --git a/kernel/sched/clock.c b/kernel/sched/clock.c index c3ae144..d111c58 100644 --- a/kernel/sched/clock.c +++ b/kernel/sched/clock.c @@ -294,7 +294,7 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_sleep_event); /* * We just idled delta nanoseconds (called with irqs disabled): */ -void sched_clock_idle_wakeup_event(u64 delta_ns) +void sched_clock_idle_wakeup_event(void) { if (timekeeping_suspended) return; diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index 3612fc7..4b24d9e 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -433,7 +433,7 @@ static void tick_nohz_stop_idle(int cpu, ktime_t now) update_ts_time_stats(cpu, ts, now, NULL); ts->idle_active = 0; - sched_clock_idle_wakeup_event(0); + sched_clock_idle_wakeup_event(); } static ktime_t tick_nohz_start_idle(int cpu, struct tick_sched *ts) -- 1.7.9.5