linux-toradex.git/kernel/time, branch imx-android-r13.2

Merge branch 'android-3.0' into imx_3.0.15_android

2012-02-02T08:58:05+00:00

Conflicts:
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/net/wireless/Makefile
	kernel/power/main.c
	sound/soc/soc-core.c

Revert "clockevents: Set noop handler in clockevents_exchange_device()"

2012-01-03T18:42:00+00:00

commit 3b87487ac5008072f138953b07505a7e3493327f upstream.

This reverts commit de28f25e8244c7353abed8de0c7792f5f883588c.

It results in resume problems for various people. See for example

  http://thread.gmane.org/gmane.linux.kernel/1233033
  http://thread.gmane.org/gmane.linux.kernel/1233389
  http://thread.gmane.org/gmane.linux.kernel/1233159
  http://thread.gmane.org/gmane.linux.kernel/1227868/focus=1230877

and the fedora and ubuntu bug reports

  https://bugzilla.redhat.com/show_bug.cgi?id=767248
  https://bugs.launchpad.net/ubuntu/+source/linux/+bug/904569

which got bisected down to the stable version of this commit.

Reported-by: Jonathan Nieder 
Reported-by: Phil Miller 
Reported-by: Philip Langdale 
Reported-by: Tim Gardner 
Cc: Thomas Gleixner 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

alarmtimers: Fix time comparison

2011-12-21T20:57:34+00:00

commit c9c024b3f3e07d087974db4c0dc46217fff3a6c0 upstream.

The expiry function compares the timer against current time and does
not expire the timer when the expiry time is >= now. That's wrong. If
the timer is set for now, then it must expire.

Make the condition expiry > now for breaking out the loop.

Signed-off-by: Thomas Gleixner 
Acked-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

clockevents: Set noop handler in clockevents_exchange_device()

2011-12-09T16:52:53+00:00

commit de28f25e8244c7353abed8de0c7792f5f883588c upstream.

If a device is shutdown, then there might be a pending interrupt,
which will be processed after we reenable interrupts, which causes the
original handler to be run. If the old handler is the (broadcast)
periodic handler the shutdown state might hang the kernel completely.

Signed-off-by: Thomas Gleixner 
Signed-off-by: Greg Kroah-Hartman

clocksource: Fix bug with max_deferment margin calculation

2011-12-09T16:52:52+00:00

commit b1f919664d04a8d0ba29cb76673c7ca3325a2006 upstream.

In order to leave a margin of 12.5% we should >> 3 not >> 5.

Signed-off-by: Yang Honggang (Joseph) 
[jstultz: Modified commit subject]
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

tick-broadcast: Stop active broadcast device when replacing it

2011-12-09T16:52:48+00:00

commit c1be84309c58b1e7c6d626e28fba41a22b364c3d upstream.

When a better rated broadcast device is installed, then the current
active device is not disabled, which results in two running broadcast
devices.

Signed-off-by: Thomas Gleixner 
Signed-off-by: Greg Kroah-Hartman

timekeeping: add arch_offset hook to ktime_get functions

2011-12-09T16:52:28+00:00

commit d004e024058a0eaca097513ce62cbcf978913e0a upstream.

ktime_get and ktime_get_ts were calling timekeeping_get_ns()
but later they were not calling arch_gettimeoffset() so architectures
using this mechanism returned 0 ns when calling these functions.

This happened for example when running Busybox's ping which calls
syscall(__NR_clock_gettime, CLOCK_MONOTONIC, ts) which eventually
calls ktime_get. As a result the returned ping travel time was zero.

Signed-off-by: Hector Palacios 
Signed-off-by: John Stultz 
Signed-off-by: Greg Kroah-Hartman

Fix "time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime" to compile on 3.0

2011-11-23T00:49:43+00:00

Change-Id: I1225f279cda04dedbfb7f853f6b58f1032bd6d2b

time: Catch invalid timespec sleep values in __timekeeping_inject_sleeptime

2011-11-23T00:49:29+00:00

Arve suggested making sure we catch possible negative sleep time
intervals that could be passed into timekeeping_inject_sleeptime.

CC: Arve Hjønnevåg 
CC: Thomas Gleixner 
Signed-off-by: John Stultz

Merge commit 'v3.0.8' into android-3.0

2011-10-27T22:01:19+00:00