From 79ce7131d9bc81581fa430ba6172dc7374416ef6 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 19 Nov 2007 23:46:16 +0100 Subject: [PATCH] --- yaml --- r: 82375 b: refs/heads/master c: 90dda1cb6ace6abd777f84bf051c4f86fa58986a h: refs/heads/master i: 82373: 6825a0340673e70496add231b0d9710fc795674e 82371: 1a1d8297b5882881ef6c299f87cf220b817b7919 82367: 681bc993b4d2e9e7807a2b89e199910b3c0760e2 v: v3 --- [refs] | 2 +- trunk/drivers/base/power/Makefile | 2 +- trunk/kernel/power/Kconfig | 23 ++++++++++++++++++++++- 3 files changed, 24 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fce85fd5ec32..e1aadf66a77a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce2b7147bb83b7d729b17c1638f092a1bcba4981 +refs/heads/master: 90dda1cb6ace6abd777f84bf051c4f86fa58986a diff --git a/trunk/drivers/base/power/Makefile b/trunk/drivers/base/power/Makefile index de28dfd3b96c..911208b89259 100644 --- a/trunk/drivers/base/power/Makefile +++ b/trunk/drivers/base/power/Makefile @@ -1,6 +1,6 @@ obj-$(CONFIG_PM) += sysfs.o obj-$(CONFIG_PM_SLEEP) += main.o -obj-$(CONFIG_PM_TRACE) += trace.o +obj-$(CONFIG_PM_TRACE_RTC) += trace.o ccflags-$(CONFIG_DEBUG_DRIVER) := -DDEBUG ccflags-$(CONFIG_PM_VERBOSE) += -DDEBUG diff --git a/trunk/kernel/power/Kconfig b/trunk/kernel/power/Kconfig index 8e186c678149..06a08f7cebda 100644 --- a/trunk/kernel/power/Kconfig +++ b/trunk/kernel/power/Kconfig @@ -44,9 +44,30 @@ config PM_VERBOSE ---help--- This option enables verbose messages from the Power Management code. +config CAN_PM_TRACE + def_bool y + depends on PM_DEBUG && PM_SLEEP && EXPERIMENTAL + config PM_TRACE + bool + help + This enables code to save the last PM event point across + reboot. The architecture needs to support this, x86 for + example does by saving things in the RTC, see below. + + The architecture specific code must provide the extern + functions from as well as the + header with a TRACE_RESUME() macro. + + The way the information is presented is architecture- + dependent, x86 will print the information during a + late_initcall. + +config PM_TRACE_RTC bool "Suspend/resume event tracing" - depends on PM_DEBUG && X86 && PM_SLEEP && EXPERIMENTAL + depends on CAN_PM_TRACE + depends on X86 + select PM_TRACE default n ---help--- This enables some cheesy code to save the last PM event point in the