Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (21884a83) · Commits · 戴 / test

Pull timer core updates from Thomas Gleixner: "The timer changes contain: - posix timer code consolidation and fixes for odd corner cases - sched_clock implementation moved from ARM to core code to avoid duplication by other architectures - alarm timer updates - clocksource and clockevents unregistration facilities - clocksource/events support for new hardware - precise nanoseconds RTC readout (Xen feature) - generic support for Xen suspend/resume oddities - the usual lot of fixes and cleanups all over the place The parts which touch other areas (ARM/XEN) have been coordinated with the relevant maintainers. Though this results in an handful of trivial to solve merge conflicts, which we preferred over nasty cross tree merge dependencies. The patches which have been committed in the last few days are bug fixes plus the posix timer lot. The latter was in akpms queue and next for quite some time; they just got forgotten and Frederic collected them last minute." * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (59 commits) hrtimer: Remove unused variable hrtimers: Move SMP function call to thread context clocksource: Reselect clocksource when watchdog validated high-res capability posix-cpu-timers: don't account cpu timer after stopped thread runtime accounting posix_timers: fix racy timer delta caching on task exit posix-timers: correctly get dying task time sample in posix_cpu_timer_schedule() selftests: add basic posix timers selftests posix_cpu_timers: consolidate expired timers check posix_cpu_timers: consolidate timer list cleanups posix_cpu_timer: consolidate expiry time type tick: Sanitize broadcast control logic tick: Prevent uncontrolled switch to oneshot mode tick: Make oneshot broadcast robust vs. CPU offlining x86: xen: Sync the CMOS RTC as well as the Xen wallclock x86: xen: Sync the wallclock when the system time is set timekeeping: Indicate that clock was set in the pvclock gtod notifier timekeeping: Pass flags instead of multiple bools to timekeeping_update() xen: Remove clock_was_set() call in the resume path hrtimers: Support resuming with two or more CPUs online (but stopped) timer: Fix jiffies wrap behavior of round_jiffies_common() ...

Documentation/devicetree/bindings/timer/lsi,zevio-timer.txt

0 → 100644

+33 −0

Original line number	Diff line number	Diff line
		TI-NSPIRE timer

		Required properties:

		- compatible : should be "lsi,zevio-timer".
		- reg : The physical base address and size of the timer (always first).
		- clocks: phandle to the source clock.

		Optional properties:

		- interrupts : The interrupt number of the first timer.
		- reg : The interrupt acknowledgement registers
		(always after timer base address)

		If any of the optional properties are not given, the timer is added as a
		clock-source only.

		Example:

		timer {
		compatible = "lsi,zevio-timer";
		reg = <0x900D0000 0x1000>, <0x900A0020 0x8>;
		interrupts = <19>;
		clocks = <&timer_clk>;
		};

		Example (no clock-events):

		timer {
		compatible = "lsi,zevio-timer";
		reg = <0x900D0000 0x1000>;
		clocks = <&timer_clk>;
		};

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/include/asm/sched_clock.h

+3 −15

Original line number	Diff line number	Diff line
		/*
		* sched_clock.h: support for extending counters to full 64-bit ns counter
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 as
		* published by the Free Software Foundation.
		/* You shouldn't include this file. Use linux/sched_clock.h instead.
		* Temporary file until all asm/sched_clock.h users are gone
		*/
		#ifndef ASM_SCHED_CLOCK
		#define ASM_SCHED_CLOCK

		extern void sched_clock_postinit(void);
		extern void setup_sched_clock(u32 (*read)(void), int bits, unsigned long rate);

		extern unsigned long long (*sched_clock_func)(void);

		#endif
		#include <linux/sched_clock.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-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

Admin message