vcs.maemo.org Git - kernel-power/blob - kernel-power-2.6.28/debian/patches/resume_no_time_warn.diff

   1 From 10ce380a196d3362689b54ac294666cec3ed36d2 Mon Sep 17 00:00:00 2001
   2 From: David Fries <David@Fries.net>
   3 Date: Sun, 26 Aug 2012 16:42:18 -0500
   4 Subject: [PATCH] disable getnstimeofday WARN_ON
   5
   6 pm_dbg_update_time is calling getnstimeofday, for the N900
   7 omap_sram_idle transitions to and from suspend and calls routines
   8 which call pm_dbg_update_time.  Calling
   9 timekeeping_suspend/timekeeping_resume doesn't seem very doable.
  10 Disabling it seems like the easier option.
  11 ---
  12  kernel/time/timekeeping.c |    5 +++++
  13  1 file changed, 5 insertions(+)
  14
  15 diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
  16 index 900f1b6..6d81608 100644
  17 --- a/kernel/time/timekeeping.c
  18 +++ b/kernel/time/timekeeping.c
  19 @@ -95,7 +95,12 @@ void getnstimeofday(struct timespec *ts)
  20         unsigned long seq;
  21         s64 nsecs;
  22
  23 +       /* pm_dbg_update_time calls getnstimeofday when timekeeping is
  24 +        * suspended, disable it
  25 +        */
  26 +       /*
  27         WARN_ON(timekeeping_suspended);
  28 +       */
  29
  30         do {
  31                 seq = read_seqbegin(&xtime_lock);
  32 --
  33 1.7.10.4
  34