diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:32:18 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-02-04 10:32:18 +0000 |
| commit | 0355e2ff4466fa0bddee64e3cdc2ba687372f4e2 (patch) | |
| tree | 88327966a39ee99d9ee11f836c45972a6d277cf6 /arch/arm/kernel | |
| parent | bea15fd77ffa1338c293328b8c74a120be53e861 (diff) | |
| parent | 6905a65879b51d326396e63dfea40861a30bc17f (diff) | |
| download | op-kernel-dev-0355e2ff4466fa0bddee64e3cdc2ba687372f4e2.zip op-kernel-dev-0355e2ff4466fa0bddee64e3cdc2ba687372f4e2.tar.gz | |
Merge branch 'sched_clock-for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/Makefile | 5 | ||||
| -rw-r--r-- | arch/arm/kernel/time.c | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile index 43b740d..9b0eb3f 100644 --- a/arch/arm/kernel/Makefile +++ b/arch/arm/kernel/Makefile @@ -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 diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index 6095517..fe31b22 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -147,8 +147,6 @@ void __init time_init(void) { system_timer = machine_desc->timer; system_timer->init(); -#ifdef CONFIG_HAVE_SCHED_CLOCK sched_clock_postinit(); -#endif } |
