You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 0b981cb94b Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip ... Pull scheduler changes from Ingo Molnar: "Continued quest to clean up and enhance the cputime code by Frederic Weisbecker, in preparation for future tickless kernel features. Other than that, smallish changes." Fix up trivial conflicts due to additions next to each other in arch/{x86/}Kconfig * 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (24 commits) cputime: Make finegrained irqtime accounting generally available cputime: Gather time/stats accounting config options into a single menu ia64: Reuse system and user vtime accounting functions on task switch ia64: Consolidate user vtime accounting vtime: Consolidate system/idle context detection cputime: Use a proper subsystem naming for vtime related APIs sched: cpu_power: enable ARCH_POWER sched/nohz: Clean up select_nohz_load_balancer() sched: Fix load avg vs. cpu-hotplug sched: Remove __ARCH_WANT_INTERRUPTS_ON_CTXSW sched: Fix nohz_idle_balance() sched: Remove useless code in yield_to() sched: Add time unit suffix to sched sysctl knobs sched/debug: Limit sd->*_idx range on sysctl sched: Remove AFFINE_WAKEUPS feature flag s390: Remove leftover account_tick_vtime() header cputime: Consolidate vtime handling on context switch sched: Move cputime code to its own file cputime: Generalize CONFIG_VIRT_CPU_ACCOUNTING tile: Remove SD_PREFER_LOCAL leftover ...		13 years ago
..
Kconfig	timers: Fixup the Kconfig consolidation fallout	13 years ago
Makefile	timers: Introduce in-kernel alarm-timer interface	14 years ago
alarmtimer.c	alarmtimer: Provide accessor to alarmtimer rtc device	13 years ago
clockevents.c	clockevents: Make clockevents_config() a global symbol	13 years ago
clocksource.c	kernel-time: fix s/then/than/ spelling errors	13 years ago
jiffies.c	time/jiffies: Rename ACTHZ to SHIFTED_HZ	13 years ago
ntp.c	time/jiffies: Rename ACTHZ to SHIFTED_HZ	13 years ago
posix-clock.c	kernel: Fix files explicitly needing EXPORT_SYMBOL infrastructure	13 years ago
tick-broadcast.c	tick: Fix the spurious broadcast timer ticks after resume	13 years ago
tick-common.c	clockevents: Make minimum delay adjustments configurable	14 years ago
tick-internal.h	clockevents: Make minimum delay adjustments configurable	14 years ago
tick-oneshot.c	clockevents: Make minimum delay adjustments configurable	14 years ago
tick-sched.c	Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip	13 years ago
timecompare.c	time: Use ARRAY_SIZE macro in timecompare.c	15 years ago
timeconv.c	time: add function to convert between calendar time and broken-down time for universal use	16 years ago
timekeeping.c	time: Fix timeekeping_get_ns overflow on 32bit systems	13 years ago
timer_list.c	nohz: Rename ts->idle_tick to ts->last_tick	13 years ago
timer_stats.c	locking, timer_stats: Annotate table_lock as raw	14 years ago