From akpm@linux-foundation.org Thu May 24 22:46:24 2007 Return-Path: Received: from murder ([unix socket]) by ogre.sisk.pl (Cyrus v2.2.12) with LMTPA; Thu, 24 May 2007 22:35:55 +0200 X-Sieve: CMU Sieve 2.2 Received: from localhost (localhost.localdomain [127.0.0.1]) by ogre.sisk.pl (Postfix) with ESMTP id 7578C4725C for ; Thu, 24 May 2007 22:35:55 +0200 (CEST) Received: from ogre.sisk.pl ([127.0.0.1]) by localhost (ogre.sisk.pl [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 11457-10 for ; Thu, 24 May 2007 22:35:54 +0200 (CEST) Received: from smtp1.linux-foundation.org (smtp1.linux-foundation.org [207.189.120.13]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ogre.sisk.pl (Postfix) with ESMTP id 54A124724C for ; Thu, 24 May 2007 22:35:54 +0200 (CEST) Received: from shell0.pdx.osdl.net (fw.osdl.org [65.172.181.6]) by smtp1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id l4OKkO6R017361 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 24 May 2007 13:46:26 -0700 Received: from localhost.localdomain (shell0.pdx.osdl.net [10.9.0.31]) by shell0.pdx.osdl.net (8.13.1/8.11.6) with ESMTP id l4OKkO9L002207; Thu, 24 May 2007 13:46:24 -0700 Message-Id: <200705242046.l4OKkO9L002207@shell0.pdx.osdl.net> Subject: + pm-do-not-require-dev-spew-to-get-pm_debug.patch added to -mm tree To: mm-commits@vger.kernel.org Cc: bcollins@ubuntu.com, greg@kroah.com, pavel@ucw.cz, rjw@sisk.pl, torvalds@linux-foundation.org From: akpm@linux-foundation.org Date: Thu, 24 May 2007 13:46:24 -0700 X-MIMEDefang-Filter: osdl$Revision: 1.179 $ X-Scanned-By: MIMEDefang 2.53 on 207.189.120.13 X-Virus-Scanned: amavisd-new at ogre.sisk.pl using MkS_Vir for Linux X-Length: 5115 X-UID: 353012 Status: RO X-Status: RC X-KMail-EncryptionState: N X-KMail-SignatureState: N X-KMail-MDN-Sent: The patch titled PM: Do not require dev spew to get PM_DEBUG has been added to the -mm tree. Its filename is pm-do-not-require-dev-spew-to-get-pm_debug.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: PM: Do not require dev spew to get PM_DEBUG From: Ben Collins 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 Cc: "Rafael J. Wysocki" Cc: Pavel Machek Cc: Greg KH Cc: Linus Torvalds Signed-off-by: Andrew Morton --- drivers/base/power/Makefile | 2 +- kernel/power/Kconfig | 17 ++++++++++++----- 2 files changed, 13 insertions(+), 6 deletions(-) diff -puN drivers/base/power/Makefile~pm-do-not-require-dev-spew-to-get-pm_debug drivers/base/power/Makefile --- a/drivers/base/power/Makefile~pm-do-not-require-dev-spew-to-get-pm_debug +++ a/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 -puN kernel/power/Kconfig~pm-do-not-require-dev-spew-to-get-pm_debug kernel/power/Kconfig --- a/kernel/power/Kconfig~pm-do-not-require-dev-spew-to-get-pm_debug +++ a/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 _ Patches currently in -mm which might be from bcollins@ubuntu.com are origin.patch avoid-zero-size-allocation-in-cache_k8_northbridges.patch cleanup-libata-hpa-support.patch pm-do-not-require-dev-spew-to-get-pm_debug.patch