driver core fixes for .36-rc2
Subsystems (2)
PATCH 1/1 driver core fixes for .36-rc2
Here are some fixes for .36-rc2 for the driver core.
It fixes a firmware oops that a lot of people are hitting, and a build error for older versions of gcc that it seems all of the ARM developers are hitting. And there's documentation fix as well.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-core-2.6.git/
All of these patches have been in the linux-next and mm trees.
The patches will be sent as a follow-on to this message to lkml for people to see.
thanks,
greg k-h
------------
drivers/base/firmware_class.c | 2 +- include/linux/kobject.h | 35 +------------------------- include/linux/kobject_ns.h | 56 +++++++++++++++++++++++++++++++++++++++++ include/linux/sysfs.h | 1 + lib/kobject_uevent.c | 4 +- 5 files changed, 61 insertions(+), 37 deletions(-) create mode 100644 include/linux/kobject_ns.h
---------------
David Howells (1):
kobject: Break the kobject namespace defs into their own header
Johannes Berg (1):
firmware_class: fix typo in error path
Xiaotian Feng (1):
kobject_uevent: fix typo in comments
PATCH 1/3 kobject: Break the kobject namespace defs into their own header
From: David Howells <[email protected]>
Break the kobject namespace defs into their own header to avoid a header file inclusion ordering problem between linux/sysfs.h and linux/kobject.h.
This fixes the build breakage on older versions of gcc.
--- include/linux/kobject.h | 35 +-------------------------- include/linux/kobject_ns.h | 56 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/sysfs.h | 1 + 3 files changed, 58 insertions(+), 34 deletions(-) create mode 100644 include/linux/kobject_ns.h
include/linux/kobject.h +1 -34
@@ -22,6 +22,7 @@#include <linux/compiler.h> #include <linux/spinlock.h> #include <linux/kref.h> +#include <linux/kobject_ns.h> #include <linux/kernel.h> #include <linux/wait.h> #include <asm/atomic.h>
@@ -136,42 +137,8 @@ struct kobj_attribute {extern const struct sysfs_ops kobj_sysfs_ops; -/* -* Namespace types which are used to tag kobjects and sysfs entries. -* Network namespace will likely be the first. -*/ -enum kobj_ns_type { -KOBJ_NS_TYPE_NONE =0 , -KOBJ_NS_TYPE_NET , -KOBJ_NS_TYPES -}; -struct sock ; -/* -* Callbacks so sysfs can determine namespaces -* @current_ns: return calling task's namespace -* @netlink_ns: return namespace to which a sock belongs (right?) -* @initial_ns: return the initial namespace (i.e. init_net_ns) -*/ -struct kobj_ns_type_operations { -enum kobj_ns_type type; -const void *(*current_ns)(void ); -const void *(*netlink_ns)(struct sock *sk); -const void *(*initial_ns)(void ); -}; - -int kobj_ns_type_register (const struct kobj_ns_type_operations *ops); -int kobj_ns_type_registered (enum kobj_ns_type type); -const struct kobj_ns_type_operations *kobj_child_ns_ops (struct kobject *parent); -const struct kobj_ns_type_operations *kobj_ns_ops (struct kobject *kobj); - -const void *kobj_ns_current (enum kobj_ns_type type); -const void *kobj_ns_netlink (enum kobj_ns_type type,struct sock *sk); -const void *kobj_ns_initial (enum kobj_ns_type type); -void kobj_ns_exit (enum kobj_ns_type type,const void *ns); - -/** * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem. *
include/linux/kobject_ns.h new file +56 -0
56 lines not on this page · raw message
include/linux/sysfs.h +1 -0
@@ -16,6 +16,7 @@#include <linux/errno.h> #include <linux/list.h> #include <linux/lockdep.h> +#include <linux/kobject_ns.h> #include <asm/atomic.h> struct kobject ;
Signature · 1 line
1.7.2
PATCH 2/3 firmware_class: fix typo in error path
In reply to Greg KHFrom: Johannes Berg <[email protected]>
In the error path, _request_firmware sets firmware_p to NULL rather than *firmware_p, which leads to passing a freed firmware struct to drivers when the firmware file cannot be found. Fix this.
Broken by commit f8a4bd3456b988fc73b2c.
--- drivers/base/firmware_class.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/base/firmware_class.c +1 -1
@@ -568,7 +568,7 @@ static int _request_firmware(const struct firmware **firmware_p, out:if (retval) {release_firmware (firmware); - firmware_p =NULL ; + *firmware_p =NULL ; }return retval;
Signature · 1 line
1.7.2
PATCH 3/3 kobject_uevent: fix typo in comments
In reply to Greg KHFrom: Xiaotian Feng <[email protected]>
s/ending/sending, s/kobject_uevent()/kobject_uevent_env() in the comments.
--- lib/kobject_uevent.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
lib/kobject_uevent.c +2 -2
@@ -123,7 +123,7 @@ static int kobj_usermode_filter(struct kobject *kobj)* @kobj: struct kobject that the action is happening to * @envp_ext: pointer to environmental data * -* Returns 0 if kobject_uevent() is completed with success or the +* Returns 0 if kobject_uevent_env() is completed with success or the * corresponding error when it fails. */ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
@@ -317,7 +317,7 @@ exit:EXPORT_SYMBOL_GPL (kobject_uevent_env);/** -* kobject_uevent - notify userspace by ending an uevent +* kobject_uevent - notify userspace by sending an uevent * * @action: action that is happening * @kobj: struct kobject that the action is happening to
Signature · 1 line
1.7.2