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

Commit 6905a658 authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: Make the sched_clock framework mandatory 



All sched_clock() providers have been converted to the sched_clock
framework, which also provides a jiffy based implementation for
the platforms that do not provide a counter.

It is now possible to make the sched_clock framework mandatory,
effectively preventing new platforms to add new sched_clock()
functions, which would be detrimental to the single zImage work.

Acked-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bc8d849d

arch/arm/Kconfig

+0 −18
Original line number Diff line number Diff line
@@ -52,9 +52,6 @@ config MIGHT_HAVE_PCI 
config SYS_SUPPORTS_APM_EMULATION

	bool



config HAVE_SCHED_CLOCK

	bool



config GENERIC_GPIO

	bool
@@ -388,7 +385,6 @@ config ARCH_PRIMA2 
	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK

	select MIGHT_HAVE_CACHE_L2X0

	select USE_OF

	select ZONE_DMA
@@ -439,7 +435,6 @@ config ARCH_MXC 
	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK

	select MULTI_IRQ_HANDLER

	help

	  Support for Freescale MXC/iMX-based family of processors
@@ -531,7 +526,6 @@ config ARCH_IXP4XX 
	select CPU_XSCALE

	select GENERIC_GPIO

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select MIGHT_HAVE_PCI

	select DMABOUNCE if PCI

	help
@@ -602,7 +596,6 @@ config ARCH_MMP 
	select CLKDEV_LOOKUP

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ
@@ -643,7 +636,6 @@ config ARCH_TEGRA 
	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_SCHED_CLOCK

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select ARCH_HAS_CPUFREQ
@@ -660,7 +652,6 @@ config ARCH_PICOXCELL 
	select DW_APB_TIMER

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select NO_IOPORT

	select SPARSE_IRQ
@@ -688,7 +679,6 @@ config ARCH_PXA 
	select ARCH_REQUIRE_GPIOLIB

	select GENERIC_CLOCKEVENTS

	select GPIO_PXA

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select PLAT_PXA

	select SPARSE_IRQ
@@ -756,7 +746,6 @@ config ARCH_SA1100 
	select CPU_FREQ

	select GENERIC_CLOCKEVENTS

	select CLKDEV_LOOKUP

	select HAVE_SCHED_CLOCK

	select TICK_ONESHOT

	select ARCH_REQUIRE_GPIOLIB

	select HAVE_IDE
@@ -813,7 +802,6 @@ config ARCH_S5P64X0 
	select CLKSRC_MMIO

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	help
@@ -846,7 +834,6 @@ config ARCH_S5PV210 
	select ARM_L1_CACHE_SHIFT_6

	select ARCH_HAS_CPUFREQ

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C_RTC if RTC_CLASS

	select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@ -889,7 +876,6 @@ config ARCH_U300 
	depends on MMU

	select CLKSRC_MMIO

	select CPU_ARM926T

	select HAVE_SCHED_CLOCK

	select HAVE_TCM

	select ARM_AMBA

	select ARM_PATCH_PHYS_VIRT
@@ -933,7 +919,6 @@ config ARCH_DAVINCI 
	select ARCH_REQUIRE_GPIOLIB

	select ZONE_DMA

	select HAVE_IDE

	select HAVE_SCHED_CLOCK

	select CLKDEV_LOOKUP

	select GENERIC_ALLOCATOR

	select GENERIC_IRQ_CHIP
@@ -948,7 +933,6 @@ config ARCH_OMAP 
	select ARCH_HAS_CPUFREQ

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK

	select ARCH_HAS_HOLES_MEMORYMODEL

	help

	  Support for TI's OMAP platform (OMAP1/2/3/4).
@@ -1114,13 +1098,11 @@ config ARCH_ACORN 
config PLAT_IOP

	bool

	select GENERIC_CLOCKEVENTS

	select HAVE_SCHED_CLOCK



config PLAT_ORION

	bool

	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select HAVE_SCHED_CLOCK



config PLAT_PXA

	bool

arch/arm/kernel/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 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 setup.o signal.o \

		   sys_arm.o stacktrace.o time.o traps.o

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

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



obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += compat.o
@@ -30,7 +30,6 @@ obj-$(CONFIG_ARTHUR) += arthur.o 
obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

obj-$(CONFIG_ARM_CPU_SUSPEND)	+= sleep.o suspend.o

obj-$(CONFIG_HAVE_SCHED_CLOCK)	+= sched_clock.o

obj-$(CONFIG_SMP)		+= smp.o smp_tlb.o

obj-$(CONFIG_HAVE_ARM_SCU)	+= smp_scu.o

obj-$(CONFIG_HAVE_ARM_TWD)	+= smp_twd.o

arch/arm/kernel/time.c

+0 −2
Original line number Diff line number Diff line
@@ -149,8 +149,6 @@ void __init time_init(void) 
{

	system_timer = machine_desc->timer;

	system_timer->init();

#ifdef CONFIG_HAVE_SCHED_CLOCK

	sched_clock_postinit();

#endif

}

arch/arm/plat-nomadik/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ config HAS_MTU 
config NOMADIK_MTU_SCHED_CLOCK

	bool

	depends on HAS_MTU

	select HAVE_SCHED_CLOCK

	help

	  Use the Multi Timer Unit as the sched_clock.

arch/arm/plat-versatile/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -12,6 +12,5 @@ config PLAT_VERSATILE_LEDS 


config PLAT_VERSATILE_SCHED_CLOCK

	def_bool y if !ARCH_INTEGRATOR_AP

	select HAVE_SCHED_CLOCK



endif