History

Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer updates from Thomas Gleixner: "The time/timekeeping/timer folks deliver with this update: - Fix a reintroduced signed/unsigned issue and cleanup the whole signed/unsigned mess in the timekeeping core so this wont happen accidentaly again. - Add a new trace clock based on boot time - Prevent injection of random sleep times when PM tracing abuses the RTC for storage - Make posix timers configurable for real tiny systems - Add tracepoints for the alarm timer subsystem so timer based suspend wakeups can be instrumented - The usual pile of fixes and updates to core and drivers" * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (23 commits) timekeeping: Use mul_u64_u32_shr() instead of open coding it timekeeping: Get rid of pointless typecasts timekeeping: Make the conversion call chain consistently unsigned timekeeping_Force_unsigned_clocksource_to_nanoseconds_conversion alarmtimer: Add tracepoints for alarm timers trace: Update documentation for mono, mono_raw and boot clock trace: Add an option for boot clock as trace clock timekeeping: Add a fast and NMI safe boot clock timekeeping/clocksource_cyc2ns: Document intended range limitation timekeeping: Ignore the bogus sleep time if pm_trace is enabled selftests/timers: Fix spelling mistake "Asyncrhonous" -> "Asynchronous" clocksource/drivers/bcm2835_timer: Unmap region obtained by of_iomap clocksource/drivers/arm_arch_timer: Map frame with of_io_request_and_map() arm64: dts: rockchip: Arch counter doesn't tick in system suspend clocksource/drivers/arm_arch_timer: Don't assume clock runs in suspend posix-timers: Make them configurable posix_cpu_timers: Move the add_device_randomness() call to a proper place timer: Move sys_alarm from timer.c to itimer.c ptp_clock: Allow for it to be optional Kconfig: Regenerate *.c_shipped files after previous changes ...

Linus Torvalds committed 9 years ago

Commit 9465d9c2 parents e71c397 c029a2b61 files · +1479 −1041Browse files

Showing the changes to init (1 of 61 files). Show all

Unified · Split

init/Kconfig+17−0
@@ -1457,6 +1457,23 @@ config SYSCTL_SYSCALL · 1456 unmodified lines
14571457
14581458 If unsure say N here.
14591459
1460+config POSIX_TIMERS
1461+ bool "Posix Clocks & timers" if EXPERT
1462+ default y
1463+ help
1464+ This includes native support for POSIX timers to the kernel.
1465+ Some embedded systems have no use for them and therefore they
1466+ can be configured out to reduce the size of the kernel image.
1467+
1468+ When this option is disabled, the following syscalls won't be
1469+ available: timer_create, timer_gettime: timer_getoverrun,
1470+ timer_settime, timer_delete, clock_adjtime, getitimer,
1471+ setitimer, alarm. Furthermore, the clock_settime, clock_gettime,
1472+ clock_getres and clock_nanosleep syscalls will be limited to
1473+ CLOCK_REALTIME, CLOCK_MONOTONIC and CLOCK_BOOTTIME only.
1474+
1475+ If unsure say y.
1476+
14601477 config KALLSYMS
14611478 bool "Load all symbols for debugging/ksymoops" if EXPERT
14621479 default y