From: 黄涛 <huangtao@rock-chips.com>
Date: Fri, 20 Jul 2012 02:39:03 +0000 (+0800)
Subject: Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb
X-Git-Tag: firefly_0821_release~8882^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=92bbd51777c39c60867b0c9a6828cb882ea349d7;p=firefly-linux-kernel-4.4.55.git

Merge remote-tracking branch 'stable/linux-3.0.y' into develop-3.0-jb

Conflicts:
	Makefile
	drivers/net/wireless/rt2x00/rt2x00usb.c
---

92bbd51777c39c60867b0c9a6828cb882ea349d7
diff --cc kernel/time/timekeeping.c
index 9b28d0407715,678ae3184efd..84d4f8b25f32
--- a/kernel/time/timekeeping.c
+++ b/kernel/time/timekeeping.c
@@@ -608,15 -627,9 +627,15 @@@ static void update_sleep_time(struct ti
   */
  static void __timekeeping_inject_sleeptime(struct timespec *delta)
  {
 +	if (!timespec_valid(delta)) {
 +		printk(KERN_WARNING "__timekeeping_inject_sleeptime: Invalid "
 +					"sleep delta value!\n");
 +		return;
 +	}
 +
  	xtime = timespec_add(xtime, *delta);
  	wall_to_monotonic = timespec_sub(wall_to_monotonic, *delta);
- 	total_sleep_time = timespec_add(total_sleep_time, *delta);
+ 	update_sleep_time(timespec_add(total_sleep_time, *delta));
  }