* [GIT PATCH] driver core fixes for .36-rc2
@ 2010-08-24 4:05 Greg KH
2010-08-24 4:24 ` [PATCH 1/3] kobject: Break the kobject namespace defs into their own header Greg Kroah-Hartman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Greg KH @ 2010-08-24 4:05 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/3] kobject: Break the kobject namespace defs into their own header
2010-08-24 4:05 [GIT PATCH] driver core fixes for .36-rc2 Greg KH
@ 2010-08-24 4:24 ` Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 2/3] firmware_class: fix typo in error path Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 3/3] kobject_uevent: fix typo in comments Greg Kroah-Hartman
2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2010-08-24 4:24 UTC (permalink / raw)
To: linux-kernel; +Cc: David Howells, Eric Biederman, Greg Kroah-Hartman
From: David Howells <dhowells@redhat.com>
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.
Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
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
diff --git a/include/linux/kobject.h b/include/linux/kobject.h
index cf343a8..7950a37 100644
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
@@ -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.
*
diff --git a/include/linux/kobject_ns.h b/include/linux/kobject_ns.h
new file mode 100644
index 0000000..82cb5bf
--- /dev/null
+++ b/include/linux/kobject_ns.h
@@ -0,0 +1,56 @@
+/* Kernel object name space definitions
+ *
+ * Copyright (c) 2002-2003 Patrick Mochel
+ * Copyright (c) 2002-2003 Open Source Development Labs
+ * Copyright (c) 2006-2008 Greg Kroah-Hartman <greg@kroah.com>
+ * Copyright (c) 2006-2008 Novell Inc.
+ *
+ * Split from kobject.h by David Howells (dhowells@redhat.com)
+ *
+ * This file is released under the GPLv2.
+ *
+ * Please read Documentation/kobject.txt before using the kobject
+ * interface, ESPECIALLY the parts about reference counts and object
+ * destructors.
+ */
+
+#ifndef _LINUX_KOBJECT_NS_H
+#define _LINUX_KOBJECT_NS_H
+
+struct sock;
+struct kobject;
+
+/*
+ * 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
+};
+
+/*
+ * 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);
+
+#endif /* _LINUX_KOBJECT_NS_H */
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index 3c92121..96eb576 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -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;
--
1.7.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/3] firmware_class: fix typo in error path
2010-08-24 4:05 [GIT PATCH] driver core fixes for .36-rc2 Greg KH
2010-08-24 4:24 ` [PATCH 1/3] kobject: Break the kobject namespace defs into their own header Greg Kroah-Hartman
@ 2010-08-24 4:24 ` Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 3/3] kobject_uevent: fix typo in comments Greg Kroah-Hartman
2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2010-08-24 4:24 UTC (permalink / raw)
To: linux-kernel; +Cc: Johannes Berg, Pekka Enberg, Greg Kroah-Hartman
From: Johannes Berg <johannes.berg@intel.com>
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.
Reported-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/base/firmware_class.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/base/firmware_class.c b/drivers/base/firmware_class.c
index c8a44f5..40af43e 100644
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
@@ -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;
--
1.7.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 3/3] kobject_uevent: fix typo in comments
2010-08-24 4:05 [GIT PATCH] driver core fixes for .36-rc2 Greg KH
2010-08-24 4:24 ` [PATCH 1/3] kobject: Break the kobject namespace defs into their own header Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 2/3] firmware_class: fix typo in error path Greg Kroah-Hartman
@ 2010-08-24 4:24 ` Greg Kroah-Hartman
2 siblings, 0 replies; 4+ messages in thread
From: Greg Kroah-Hartman @ 2010-08-24 4:24 UTC (permalink / raw)
To: linux-kernel; +Cc: Xiaotian Feng, Greg Kroah-Hartman
From: Xiaotian Feng <xtfeng@gmail.com>
s/ending/sending, s/kobject_uevent()/kobject_uevent_env() in the comments.
Signed-off-by: Xiaotian Feng <xtfeng@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
lib/kobject_uevent.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index b935795..70af0a7 100644
--- a/lib/kobject_uevent.c
+++ b/lib/kobject_uevent.c
@@ -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
--
1.7.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2010-08-24 4:25 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-08-24 4:05 [GIT PATCH] driver core fixes for .36-rc2 Greg KH
2010-08-24 4:24 ` [PATCH 1/3] kobject: Break the kobject namespace defs into their own header Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 2/3] firmware_class: fix typo in error path Greg Kroah-Hartman
2010-08-24 4:24 ` [PATCH 3/3] kobject_uevent: fix typo in comments Greg Kroah-Hartman
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.