summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-07-15 10:29:00 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-07-20 19:11:55 +0200
commit60f778fcfc89524ece9fedbd8ae3eecd58adb221 (patch)
tree660ed22258b6dc0fb593125de8115afcbf276d6c /include
parent19491de1201af8b1a506b32387a875dfb3bec2f9 (diff)
downloadlwn-60f778fcfc89524ece9fedbd8ae3eecd58adb221.tar.gz
lwn-60f778fcfc89524ece9fedbd8ae3eecd58adb221.zip
suspend: Prevent might sleep splats
timekeeping suspend/resume calls read_persistant_clock() which takes rtc_lock. That results in might sleep warnings because at that point we run with interrupts disabled. We cannot convert rtc_lock to a raw spinlock as that would trigger other might sleep warnings. As a temporary workaround we disable the might sleep warnings by setting system_state to SYSTEM_SUSPEND before calling sysdev_suspend() and restoring it to SYSTEM_RUNNING afer sysdev_resume(). Needs to be revisited. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/kernel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h
index 45894a469a03..3f7145e8a1ae 100644
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
@@ -326,7 +326,7 @@ extern enum system_states {
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
- SYSTEM_SUSPEND_DISK,
+ SYSTEM_SUSPEND,
} system_state;
#define TAINT_PROPRIETARY_MODULE 0