Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 (6d87f207) · Commits · e / devices / android_kernel_fairphone_FP4

drivers/base/firmware_class.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -568,7 +568,7 @@ static int _request_firmware(const struct firmware **firmware_p,
	out:		out:
	if (retval) {		if (retval) {
	release_firmware(firmware);		release_firmware(firmware);
	firmware_p = NULL;		*firmware_p = NULL;
	}		}

	return retval;		return retval;

include/linux/kobject.h

+1 −34

Original line number	Original line	Diff line number	Diff line
	@@ -22,6 +22,7 @@
	#include <linux/compiler.h>		#include <linux/compiler.h>
	#include <linux/spinlock.h>		#include <linux/spinlock.h>
	#include <linux/kref.h>		#include <linux/kref.h>
			#include <linux/kobject_ns.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>
	#include <linux/wait.h>		#include <linux/wait.h>
	#include <asm/atomic.h>		#include <asm/atomic.h>
	@@ -136,42 +137,8 @@ struct kobj_attribute {

	extern const struct sysfs_ops kobj_sysfs_ops;		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;		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.		* struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
	*		*

include/linux/kobject_ns.h

0 → 100644

+56 −0

Original line number	Original line	Diff line number	Diff line
			/* 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 */

include/linux/sysfs.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -16,6 +16,7 @@
	#include <linux/errno.h>		#include <linux/errno.h>
	#include <linux/list.h>		#include <linux/list.h>
	#include <linux/lockdep.h>		#include <linux/lockdep.h>
			#include <linux/kobject_ns.h>
	#include <asm/atomic.h>		#include <asm/atomic.h>

	struct kobject;		struct kobject;

lib/kobject_uevent.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -123,7 +123,7 @@ static int kobj_usermode_filter(struct kobject *kobj)
	* @kobj: struct kobject that the action is happening to		* @kobj: struct kobject that the action is happening to
	* @envp_ext: pointer to environmental data		* @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.		* corresponding error when it fails.
	*/		*/
	int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,		int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
	@@ -317,7 +317,7 @@ int kobject_uevent_env(struct kobject *kobj, enum kobject_action action,
	EXPORT_SYMBOL_GPL(kobject_uevent_env);		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		* @action: action that is happening
	* @kobj: struct kobject that the action is happening to		* @kobj: struct kobject that the action is happening to