From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Wed, 5 Mar 2008 00:37:35 +0000 (-0800)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
X-Git-Tag: v2.6.25-rc4~5
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=2c6f2db13a2428aa16f54f50232a589ddd5d7d01;p=cascardo%2Flinux.git

Merge git://git./linux/kernel/git/gregkh/driver-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6:
  debugfs: fix sparse warnings
  Driver core: Fix cleanup when failing device_add().
  driver core: Remove dpm_sysfs_remove() from error path of device_add()
  PM: fix new mutex-locking bug in the PM core
  PM: Do not acquire device semaphores upfront during suspend
  kobject: properly initialize ksets
  sysfs: CONFIG_SYSFS_DEPRECATED fix
  driver core: fix up Kconfig text for CONFIG_SYSFS_DEPRECATED
---

2c6f2db13a2428aa16f54f50232a589ddd5d7d01
diff --cc init/Kconfig
index 442850b984be,98ebf3725412..074ac97f55e3
--- a/init/Kconfig
+++ b/init/Kconfig
@@@ -366,22 -366,10 +366,25 @@@ config RESOURCE_COUNTER
            infrastructure that works with cgroups
  	depends on CGROUPS
  
 +config CGROUP_MEM_RES_CTLR
 +	bool "Memory Resource Controller for Control Groups"
 +	depends on CGROUPS && RESOURCE_COUNTERS
 +	help
 +	  Provides a memory resource controller that manages both page cache and
 +	  RSS memory.
 +
 +	  Note that setting this option increases fixed memory overhead
 +	  associated with each page of memory in the system by 4/8 bytes
 +	  and also increases cache misses because struct page on many 64bit
 +	  systems will not fit into a single cache line anymore.
 +
 +	  Only enable when you're ok with these trade offs and really
 +	  sure you need the memory resource controller.
 +
  config SYSFS_DEPRECATED
+ 	bool
+ 
+ config SYSFS_DEPRECATED_V2
  	bool "Create deprecated sysfs files"
  	depends on SYSFS
  	default y
@@@ -397,11 -386,27 +401,12 @@@
  
  	  If enabled, this option will also move any device structures
  	  that belong to a class, back into the /sys/class hierarchy, in
- 	  order to support older versions of udev.
+ 	  order to support older versions of udev and some userspace
+ 	  programs.
  
- 	  If you are using a distro that was released in 2006 or later,
- 	  it should be safe to say N here.
+ 	  If you are using a distro with the most recent userspace
+ 	  packages, it should be safe to say N here.
  
 -config CGROUP_MEM_CONT
 -	bool "Memory controller for cgroups"
 -	depends on CGROUPS && RESOURCE_COUNTERS
 -	help
 -	  Provides a memory controller that manages both page cache and
 -	  RSS memory.
 -
 -	  Note that setting this option increases fixed memory overhead
 -	  associated with each page of memory in the system by 4/8 bytes
 -	  and also increases cache misses because struct page on many 64bit
 -	  systems will not fit into a single cache line anymore.
 -
 -	  Only enable when you're ok with these trade offs and really
 -	  sure you need the memory controller.
 -
  config PROC_PID_CPUSET
  	bool "Include legacy /proc/<pid>/cpuset file"
  	depends on CPUSETS