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

Commit 38ff87f7 authored by Stephen Boyd's avatar Stephen Boyd Committed by John Stultz
Browse files

sched_clock: Make ARM's sched_clock generic for all architectures 



Nothing about the sched_clock implementation in the ARM port is
specific to the architecture. Generalize the code so that other
architectures can use it by selecting GENERIC_SCHED_CLOCK.

Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
[jstultz: Merge minor collisions with other patches in my tree]
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent ffbfb5e3

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ config ARM 
	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_STRNCPY_FROM_USER

arch/arm/common/timer-sp.c

+1 −1
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ 
#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>

#include <linux/sched_clock.h>



#include <asm/sched_clock.h>

#include <asm/hardware/arm_timer.h>

#include <asm/hardware/timer-sp.h>

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ CFLAGS_REMOVE_return_address.o = -pg 
# Object file lists.



obj-y		:= elf.o entry-armv.o entry-common.o irq.o opcodes.o \

		   process.o ptrace.o return_address.o sched_clock.o \

		   process.o ptrace.o return_address.o \

		   setup.o signal.o stacktrace.o sys_arm.o time.o traps.o



obj-$(CONFIG_ATAGS)		+= atags_parse.o

arch/arm/kernel/arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/init.h>

#include <linux/types.h>

#include <linux/errno.h>

#include <linux/sched_clock.h>



#include <asm/delay.h>

#include <asm/sched_clock.h>



#include <clocksource/arm_arch_timer.h>

arch/arm/kernel/time.c

+1 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <linux/timer.h>

#include <linux/clocksource.h>

#include <linux/irq.h>

#include <linux/sched_clock.h>



#include <asm/thread_info.h>

#include <asm/sched_clock.h>

#include <asm/stacktrace.h>

#include <asm/mach/arch.h>

#include <asm/mach/time.h>
@@ -120,6 +120,4 @@ void __init time_init(void) 
		machine_desc->init_time();

	else

		clocksource_of_init();



	sched_clock_postinit();

}