PM: Do not require dev spew to get PM_DEBUG

In order to enable things like PM_TRACE, you're required to enable
PM_DEBUG, which sends a large spew of messages on boot, and often times can
overflow dmesg buffer.

Create new PM_VERBOSE and shift that to be the option that enables
drivers/base/power's messages.

Signed-off-by: Ben Collins <bcollins@ubuntu.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 13 insertions, 6 deletions

diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index fff178007208..966a5e287415 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -5,6 +5,6 @@ obj-$(CONFIG_PM_TRACE)	+= trace.o
 ifeq ($(CONFIG_DEBUG_DRIVER),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
-ifeq ($(CONFIG_PM_DEBUG),y)
+ifeq ($(CONFIG_PM_VERBOSE),y)
 EXTRA_CFLAGS += -DDEBUG
 endif
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig
index 73328476761c..7358609e4735 100644
--- a/kernel/power/Kconfig
+++ b/kernel/power/Kconfig
@@ -33,13 +33,20 @@ config PM_DEBUG
         bool "Power Management Debug Support"
         depends on PM
         ---help---
-        This option enables verbose debugging support in the Power Management
-        code. This is helpful when debugging and reporting various PM bugs, 
-        like suspend support.
+        This option enables various debugging support in the Power Management
+        code. This is helpful when debugging and reporting PM bugs, like
+        suspend support.
+
+config PM_VERBOSE
+        bool "Verbose Power Management debugging"
+        depends on PM_DEBUG
+        default n
+        ---help---
+        This option enables verbose messages from the Power Management code.
 
 config DISABLE_CONSOLE_SUSPEND
         bool "Keep console(s) enabled during suspend/resume (DANGEROUS)"
-        depends on PM && PM_DEBUG
+        depends on PM_DEBUG
         default n
         ---help---
         This option turns off the console suspend mechanism that prevents
@@ -50,7 +57,7 @@ config DISABLE_CONSOLE_SUSPEND
 
 config PM_TRACE
         bool "Suspend/resume event tracing"
-        depends on PM && PM_DEBUG && X86_32 && EXPERIMENTAL
+        depends on PM_DEBUG && X86_32 && EXPERIMENTAL
         default n
         ---help---
         This enables some cheesy code to save the last PM event point in the