John Stultz 304529b1b6 time: Add timekeeping_inject_sleeptime ... Some platforms cannot implement read_persistent_clock, as their RTC devices are only accessible when interrupts are enabled. This keeps them from being used by the timekeeping code on resume to measure the time in suspend. The RTC layer tries to work around this, by calling do_settimeofday on resume after irqs are reenabled to set the time properly. However, this only corrects CLOCK_REALTIME, and does not properly adjust the sleep time value. This causes btime in /proc/stat to be incorrect as well as making the new CLOCK_BOTTTIME inaccurate. This patch resolves the issue by introducing a new timekeeping hook to allow the RTC layer to inject the sleep time on resume. The code also checks to make sure that read_persistent_clock is nonfunctional before setting the sleep time, so that should the RTC's HCTOSYS option be configured in on a system that does support read_persistent_clock we will not increase the total_sleep_time twice. CC: Arve Hjønnevåg <arve@android.com> CC: Thomas Gleixner <tglx@linutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: John Stultz <john.stultz@linaro.org>		2011-04-26 14:01:41 -07:00
..
debug	Fix common misspellings	2011-03-31 11:26:23 -03:00
gcov	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	2011-03-20 18:14:55 -07:00
irq	Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for-linus', 'irq-fixes-for-linus' and 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-04-07 12:12:58 -07:00
power	PM: Fix error code paths executed after failing syscore_suspend()	2011-04-18 23:58:59 +02:00
time	time: Add timekeeping_inject_sleeptime	2011-04-26 14:01:41 -07:00
trace	block: make unplug timer trace event correspond to the schedule() unplug	2011-04-16 13:51:05 +02:00
.gitignore	…
Kconfig.freezer	…
Kconfig.hz	…
Kconfig.locks	…
Kconfig.preempt	…
Makefile	crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn	2011-03-23 19:47:19 -07:00
acct.c	…
async.c	…
audit.c	…
audit.h	…
audit_tree.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
audit_watch.c	…
auditfilter.c	…
auditsc.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
backtracetest.c	…
bounds.c	memcg: remove direct page_cgroup-to-page pointer	2011-03-23 19:46:28 -07:00
capability.c	userns: make has_capability* into real functions	2011-03-23 19:47:06 -07:00
cgroup.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
cgroup_freezer.c	…
compat.c	…
configs.c	…
cpu.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
cpuset.c	cpuset: hold callback_mutex in cpuset_post_clone()	2011-03-23 19:46:35 -07:00
crash_dump.c	crash_dump: export is_kdump_kernel to modules, consolidate elfcorehdr_addr, setup_elfcorehdr and saved_max_pfn	2011-03-23 19:47:19 -07:00
cred.c	userns: security: make capabilities relative to the user namespace	2011-03-23 19:47:02 -07:00
delayacct.c	…
dma.c	…
elfcore.c	…
exec_domain.c	…
exit.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
extable.c	…
fork.c	Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block	2011-03-24 10:16:26 -07:00
freezer.c	…
futex.c	futex: Set FLAGS_HAS_TIMEOUT during futex_wait restart setup	2011-04-15 16:34:32 +02:00
futex_compat.c	userns: user namespaces: convert several capable() calls	2011-03-23 19:47:08 -07:00
groups.c	userns: user namespaces: convert several capable() calls	2011-03-23 19:47:08 -07:00
hrtimer.c	…
hung_task.c	…
hw_breakpoint.c	…
irq_work.c	…
itimer.c	…
jump_label.c	…
kallsyms.c	Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2011-03-25 17:52:22 -07:00
kexec.c	PM: Add missing syscore_suspend() and syscore_resume() calls	2011-04-20 00:36:11 +02:00
kfifo.c	…
kmod.c	…
kprobes.c	…
ksysfs.c	…
kthread.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
latencytop.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
lockdep.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
lockdep_internals.h	…
lockdep_proc.c	lockdep: Remove unused 'factor' variable from lockdep_stats_show()	2011-03-23 13:54:47 +01:00
lockdep_states.h	…
module.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
mutex-debug.c	…
mutex-debug.h	…
mutex.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
mutex.h	…
notifier.c	…
ns_cgroup.c	…
nsproxy.c	userns: user namespaces: convert several capable() calls	2011-03-23 19:47:08 -07:00
padata.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
panic.c	move x86 specific oops=panic to generic code	2011-03-22 17:44:11 -07:00
params.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
perf_event.c	perf_event: Fix cgrp event scheduling bug in perf_enable_on_exec()	2011-04-11 11:07:55 +02:00
pid.c	next_pidmap: fix overflow condition	2011-04-18 10:35:30 -07:00
pid_namespace.c	pidns: call pid_ns_prepare_proc() from create_pid_namespace()	2011-03-23 19:46:58 -07:00
pm_qos_params.c	…
posix-cpu-timers.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
posix-timers.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
printk.c	printk: allow setting DEFAULT_MESSAGE_LEVEL via Kconfig	2011-03-22 17:44:13 -07:00
profile.c	…
ptrace.c	userns: allow ptrace from non-init user namespaces	2011-03-23 19:47:05 -07:00
range.c	…
rcupdate.c	…
rcutiny.c	…
rcutiny_plugin.h	…
rcutorture.c	…
rcutree.c	…
rcutree.h	…
rcutree_plugin.h	…
rcutree_trace.c	…
relay.c	…
res_counter.c	memcg: res_counter_read_u64(): fix potential races on 32-bit machines	2011-03-23 19:46:22 -07:00
resource.c	…
rtmutex-debug.c	…
rtmutex-debug.h	…
rtmutex-tester.c	…
rtmutex.c	…
rtmutex.h	…
rtmutex_common.h	…
rwsem.c	…
sched.c	block: let io_schedule() flush the plug inline	2011-04-16 13:27:55 +02:00
sched_autogroup.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sched_autogroup.h	…
sched_clock.c	…
sched_cpupri.c	…
sched_cpupri.h	…
sched_debug.c	…
sched_fair.c	sched: Fix erroneous all_pinned logic	2011-04-11 11:08:54 +02:00
sched_features.h	…
sched_idletask.c	sched, doc: Update sched-design-CFS.txt	2011-03-23 14:09:41 +01:00
sched_rt.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
sched_stats.h	…
sched_stoptask.c	sched, doc: Update sched-design-CFS.txt	2011-03-23 14:09:41 +01:00
seccomp.c	…
semaphore.c	…
signal.c	signal.c: fix erroneous syscall kernel-doc	2011-04-08 11:05:24 -07:00
smp.c	smp: move smp setup functions to kernel/smp.c	2011-03-22 17:44:11 -07:00
softirq.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
spinlock.c	…
srcu.c	…
stacktrace.c	…
stop_machine.c	kthread: use kthread_create_on_node()	2011-03-22 17:44:01 -07:00
sys.c	userns: user namespaces: convert all capable checks in kernel/sys.c	2011-03-23 19:47:06 -07:00
sys_ni.c	…
sysctl.c	sysctl: restrict write access to dmesg_restrict	2011-03-23 19:46:54 -07:00
sysctl_binary.c	…
sysctl_check.c	sysctl_check: drop dead code	2011-03-23 19:46:51 -07:00
taskstats.c	taskstats: use appropriate printk priority level	2011-03-23 19:47:14 -07:00
test_kprobes.c	…
time.c	…
timeconst.pl	…
timer.c	…
tracepoint.c	…
tsacct.c	…
uid16.c	userns: user namespaces: convert several capable() calls	2011-03-23 19:47:08 -07:00
up.c	…
user-return-notifier.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
user.c	userns: add a user_namespace as creator/owner of uts_namespace	2011-03-23 19:46:59 -07:00
user_namespace.c	…
utsname.c	userns: allow sethostname in a container	2011-03-23 19:47:03 -07:00
utsname_sysctl.c	…
wait.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
watchdog.c	kernel/watchdog.c: always return NOTIFY_OK during cpu up/down events	2011-03-22 17:44:12 -07:00
workqueue.c	Fix common misspellings	2011-03-31 11:26:23 -03:00
workqueue_sched.h	…