Here are some driver core bugfixes and documentation updates for

2.6.24-rc3.  It fixes a regression with CONFIG_PM being set and not set

that people have reported.
There's some other minor fixes, and an update for the UIO documentation.
All of these have been in the -mm tree for a while.
Please pull from:

	master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/
Patches will be sent as a follow-on to this message to lkml for people

to see.
thanks,
greg k-h
 Documentation/DocBook/Makefile       |    2 +-

 Documentation/DocBook/uio-howto.tmpl |   90 ++++++++++++----------------------

 drivers/base/core.c                  |    4 +-

 drivers/base/power/Makefile          |    3 +-

 drivers/base/power/main.c            |    8 +---

 drivers/base/power/power.h           |   28 ++++++++---

 drivers/char/Kconfig                 |    2 +-

 fs/sysfs/file.c                      |    6 ++-

 lib/kobject.c                        |    4 +-

 9 files changed, 68 insertions(+), 79 deletions(-)
---------------
Daniel Drake (1):

      create /sys/.../power when CONFIG_PM is set
Hans J Koch (2):

      UIO: fix up the UIO documentation

      UIO: add UIO documentation target to DocBook Makefile
Johannes Berg (1):

      kobject: two typo fixes
Kay Sievers (1):

      allow LEGACY_PTYS to be set to 0
Miao Xie (1):

      sysfs: fix off-by-one error in fill_read_buffer()
-

From: Miao Xie <miaox@cn.fujitsu.com>
I found that there is a off-by-one problem in the following code.
Version:	2.6.24-rc2

File:		fs/sysfs/file.c:118-122

Function:	fill_read_buffer

--------------------------------------------------------------------

	count = ops->show(kobj, attr_sd->s_attr.attr, buffer->page);
	sysfs_put_active_two(attr_sd);
	BUG_ON(count > (ssize_t)PAGE_SIZE);

--------------------------------------------------------------------
Because according to the specification of the sysfs and the implement of

the show methods, the show methods return the number of bytes which would

be generated for the given input, excluding the trailing null.So if the

return value of the show methods equals PAGE_SIZE - 1, the buffer is full

in fact.  And if the return value equals PAGE_SIZE, the resulting string

was already truncated,or buffer overflow occurred.
This patch fixes an off-by-one error in fill_read_buffer.
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Acked-by: Tejun Heo <teheo@suse.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 fs/sysfs/file.c |    6 +++++-

 1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c

index 27d1785..4045bdc 100644

--- a/fs/sysfs/file.c

+++ b/fs/sysfs/file.c

@@ -119,7 +119,11 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer
 	sysfs_put_active_two(attr_sd);
-	BUG_ON(count > (ssize_t)PAGE_SIZE);

+	/*

+	 * The code works fine with PAGE_SIZE return but it's likely to

+	 * indicate truncated result or overflow in normal use cases.

+	 */

+	BUG_ON(count >= (ssize_t)PAGE_SIZE);

 	if (count >= 0) {

 		buffer->needs_read_fill = 0;

 		buffer->count = count;

--

1.5.3.4
-

From: Daniel Drake <dsd@gentoo.org>
The CONFIG_SUSPEND changes in 2.6.23 caused a regression under certain

configuration conditions (SUSPEND=n, USB_AUTOSUSPEND=y) where all USB

device attributes in sysfs (idVendor, idProduct, ...) silently disappeared,

causing udev breakage and more.
The cause of this is that the /sys/.../power subdirectory is now only

created when CONFIG_PM_SLEEP is set, however, it should be created whenever

CONFIG_PM is set to handle the above situation.  The following patch fixes

the regression.
Signed-off-by: Daniel Drake <dsd@gentoo.org>

Acked-by: Rafael J. Wysocki <rjw@sisk.pl>

Cc: Alan Stern <stern@rowland.harvard.edu>

Cc: Kay Sievers <kay.sievers@vrfy.org>

Cc: stable <stable@kernel.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/base/core.c         |    4 +++-

 drivers/base/power/Makefile |    3 ++-

 drivers/base/power/main.c   |    8 +-------

 drivers/base/power/power.h  |   28 +++++++++++++++++++++-------

 4 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c

index 3f4d6aa..2683eac 100644

--- a/drivers/base/core.c

+++ b/drivers/base/core.c

@@ -770,9 +770,10 @@ int device_add(struct device *dev)

 	error = device_add_attrs(dev);

 	if (error)

 		goto AttrsError;

-	error = device_pm_add(dev);

+	error = dpm_sysfs_add(dev);

 	if (error)

 		goto PMError;

+	device_pm_add(dev);

 	error = bus_add_device(dev);

 	if (error)

 		goto BusError;

@@ -797,6 +798,7 @@ int device_add(struct device *dev)

 	return error;

  BusError:

 	device_pm_remove(dev);

+	dpm_sysfs_remove(dev);

  PMError:

 	if (dev->bus)

 		blocking_notifier_call_chain(&dev->bus->bus_notifier,

diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile

index a803733..44504e6 100644

--- a/drivers/base/power/Makefile

+++ b/drivers/base/power/Makefile

@@ -1,5 +1,6 @@

 obj-y			:= shut...
[ message continues ]

From: Hans J Koch <hjk@linutronix.de>
Remove references to the old uio_dummy demo module from UIO documentation.

Add a small paragraph to make it clearer that UIO is not a universal driver

interface.
Signed-off-by: Hans J Koch <hjk@linutronix.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/DocBook/uio-howto.tmpl |   90 ++++++++++++----------------------

 1 files changed, 32 insertions(+), 58 deletions(-)
diff --git a/Documentation/DocBook/uio-howto.tmpl b/Documentation/DocBook/uio-howto.tmpl

index c119484..fdd7f4f 100644

--- a/Documentation/DocBook/uio-howto.tmpl

+++ b/Documentation/DocBook/uio-howto.tmpl

@@ -30,6 +30,12 @@
 <revhistory>

 	<revision>

+	<revnumber>0.4</revnumber>

+	<date>2007-11-26</date>

+	<authorinitials>hjk</authorinitials>

+	<revremark>Removed section about uio_dummy.</revremark>

+	</revision>

+	<revision>

 	<revnumber>0.3</revnumber>

 	<date>2007-04-29</date>

 	<authorinitials>hjk</authorinitials>

@@ -94,6 +100,26 @@ interested in translating it, please email me

 	user space. This simplifies development and reduces the risk of

 	serious bugs within a kernel module.

 	</para>

+	<para>

+	Please note that UIO is not an universal driver interface. Devices

+	that are already handled well by other kernel subsystems (like

+	networking or serial or USB) are no candidates for an UIO driver.

+	Hardware that is ideally suited for an UIO driver fulfills all of

+	the following:

+	</para>

+<itemizedlist>

+<listitem>

+	<para>The device has memory that can be mapped. The device can be

+	controlled completely by writing to this memory.</para>

+</listitem>

+<listitem>

+	<para>The device usually generates interrupts.</para>

+</listitem>

+<listitem>

+	<para>The device does not fit into one of the standard kernel

+	subsystems.&...
[ message continues ]

From: Johannes Berg <johannes@sipsolutions.net>
This fixes two typos from commit

34358c26a2c96b2a068dc44e0ac602106a466bce.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 lib/kobject.c |    4 ++--

 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/kobject.c b/lib/kobject.c

index a7e3bf4..b52e9f4 100644

--- a/lib/kobject.c

+++ b/lib/kobject.c

@@ -313,8 +313,8 @@ int kobject_rename(struct kobject * kobj, const char *new_name)

 		struct kobject *temp_kobj;

 		temp_kobj = kset_find_obj(kobj->kset, new_name);

 		if (temp_kobj) {

-			printk(KERN_WARNING "kobject '%s' can not be renamed "

-			       "to '%s' as '%s' is already in existance.\n",

+			printk(KERN_WARNING "kobject '%s' cannot be renamed "

+			       "to '%s' as '%s' is already in existence.\n",

 			       kobject_name(kobj), new_name, new_name);

 			kobject_put(temp_kobj);

 			return -EINVAL;

--

1.5.3.4
-

From: Hans J Koch <hjk@linutronix.de>
Add the DocBook documentation for the Userspace I/O framework

to the Makefile.
Signed-off-by: Satoru Takeuchi <takeuchi_satoru@jp.fujitsu.com>

Signed-off-by: Hans J Koch <hjk@linutronix.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 Documentation/DocBook/Makefile |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile

index 054a7ec..4953bc2 100644

--- a/Documentation/DocBook/Makefile

+++ b/Documentation/DocBook/Makefile

@@ -11,7 +11,7 @@ DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \

 	    procfs-guide.xml writing_usb_driver.xml \

 	    kernel-api.xml filesystems.xml lsm.xml usb.xml \

 	    gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \

-	    genericirq.xml s390-drivers.xml

+	    genericirq.xml s390-drivers.xml uio-howto.xml
 ###

 # The build process is as follows (targets):

--

1.5.3.4
-

From: Kay Sievers <kay.sievers@vrfy.org>
The count of legacy pty devices can be set by a kernel commandline

parameter. For the distro kernel, we would like to disable all pty's

by default, but keep the opportunity to request devices on the kernel

commandline.
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>

Acked-by: Jean Delvare <jdelvare@suse.de>

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

---

 drivers/char/Kconfig |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig

index bf18d75..a509b8d 100644

--- a/drivers/char/Kconfig

+++ b/drivers/char/Kconfig

@@ -457,7 +457,7 @@ config LEGACY_PTYS

 config LEGACY_PTY_COUNT

 	int "Maximum number of legacy PTY in use"

 	depends on LEGACY_PTYS

-	range 1 256

+	range 0 256

 	default "256"

 	---help---

 	  The maximum number of legacy PTYs that can be used at any one time.

--

1.5.3.4
-