Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c3d103b authored by Hugh Dickins's avatar Hugh Dickins Committed by Ingo Molnar
Browse files

sched: move sched_clock before first use 



Move sched_clock() up to stop warning: weak declaration of `sched_clock'
after first use results in unspecified behavior (if -fno-unit-at-a-time).

Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Cc: Mike Travis <travis@sgi.com>
Cc: Ben Herrenschmidt <benh@kernel.crashing.org>
Cc: Linuxppc-dev@ozlabs.org
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e26873bb

kernel/sched_clock.c

+9 −10
Original line number Diff line number Diff line
@@ -32,6 +32,15 @@ 
#include <linux/ktime.h>

#include <linux/module.h>



/*

 * Scheduler clock - returns current time in nanosec units.

 * This is default implementation.

 * Architectures and sub-architectures can override this.

 */

unsigned long long __attribute__((weak)) sched_clock(void)

{

	return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);

}



#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
@@ -321,16 +330,6 @@ EXPORT_SYMBOL_GPL(sched_clock_idle_wakeup_event); 


#endif



/*

 * Scheduler clock - returns current time in nanosec units.

 * This is default implementation.

 * Architectures and sub-architectures can override this.

 */

unsigned long long __attribute__((weak)) sched_clock(void)

{

	return (unsigned long long)jiffies * (NSEC_PER_SEC / HZ);

}



unsigned long long cpu_clock(int cpu)

{

	unsigned long long clock;