Merge branch 'pm-runtime' into pm-for-linus

Browse source

* pm-runtime:
  PM / Tracing: build rpm-traces.c only if CONFIG_PM_RUNTIME is set
  PM / Runtime: Replace dev_dbg() with trace_rpm_*()
  PM / Runtime: Introduce trace points for tracing rpm_* functions
  PM / Runtime: Don't run callbacks under lock for power.irq_safe set
  USB: Add wakeup info to debugging messages
  PM / Runtime: pm_runtime_idle() can be called in atomic context
  PM / Runtime: Add macro to test for runtime PM events
  PM / Runtime: Add might_sleep() to runtime PM functions

...

This commit is contained in:

Rafael J. Wysocki 2011-10-07 23:16:55 +02:00

parent 3ee72ca992 2a5306cc5f

commit d727b60659

20 changed files with 226 additions and 66 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

kernel/trace/Makefile

View file

20

kernel/trace/rpm-traces.c

View file