Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d2a3b914 authored by Matthew Wilcox's avatar Matthew Wilcox Committed by Greg Kroah-Hartman
Browse files

class: add lockdep infrastructure 



This adds the infrastructure to properly handle lockdep issues when the
internal class semaphore is changed to a mutex.

Matthew wrote the original patch, and Greg fixed it up to work properly
with the class_create() function.


From: Matthew Wilcox <matthew@wil.cx>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Cc: Dave Young <hidave.darkstar@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: James Bottomley <James.Bottomley@HansenPartnership.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1e412508

drivers/base/class.c

+6 −5
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void remove_class_attrs(struct class *cls) 
	}

}



int class_register(struct class *cls)

int __class_register(struct class *cls, struct lock_class_key *key)

{

	struct class_private *cp;

	int error;
@@ -178,6 +178,7 @@ int class_register(struct class *cls) 
	class_put(cls);

	return error;

}

EXPORT_SYMBOL_GPL(__class_register);



void class_unregister(struct class *cls)

{
@@ -203,7 +204,8 @@ static void class_create_release(struct class *cls) 
 * Note, the pointer created here is to be destroyed when finished by

 * making a call to class_destroy().

 */

struct class *class_create(struct module *owner, const char *name)

struct class *__class_create(struct module *owner, const char *name,

			     struct lock_class_key *key)

{

	struct class *cls;

	int retval;
@@ -218,7 +220,7 @@ struct class *class_create(struct module *owner, const char *name) 
	cls->owner = owner;

	cls->class_release = class_create_release;



	retval = class_register(cls);

	retval = __class_register(cls, key);

	if (retval)

		goto error;
@@ -228,6 +230,7 @@ struct class *class_create(struct module *owner, const char *name) 
	kfree(cls);

	return ERR_PTR(retval);

}

EXPORT_SYMBOL_GPL(__class_create);



/**

 * class_destroy - destroys a struct class structure
@@ -412,9 +415,7 @@ int __init classes_init(void) 


EXPORT_SYMBOL_GPL(class_create_file);

EXPORT_SYMBOL_GPL(class_remove_file);

EXPORT_SYMBOL_GPL(class_register);

EXPORT_SYMBOL_GPL(class_unregister);

EXPORT_SYMBOL_GPL(class_create);

EXPORT_SYMBOL_GPL(class_destroy);



EXPORT_SYMBOL_GPL(class_interface_register);

include/linux/device.h

+23 −2
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/kobject.h>

#include <linux/klist.h>

#include <linux/list.h>

#include <linux/lockdep.h>

#include <linux/compiler.h>

#include <linux/types.h>

#include <linux/module.h>
@@ -205,8 +206,18 @@ struct class { 


extern struct kobject *sysfs_dev_block_kobj;

extern struct kobject *sysfs_dev_char_kobj;

extern int __must_check class_register(struct class *class);

extern int __must_check __class_register(struct class *class,

					 struct lock_class_key *key);

extern void class_unregister(struct class *class);



/* This is a #define to keep the compiler from merging different

 * instances of the __key variable */

#define class_register(class)			\

({						\

	static struct lock_class_key __key;	\

	__class_register(class, &__key);	\

})



extern int class_for_each_device(struct class *class, struct device *start,

				 void *data,

				 int (*fn)(struct device *dev, void *data));
@@ -239,9 +250,19 @@ struct class_interface { 
extern int __must_check class_interface_register(struct class_interface *);

extern void class_interface_unregister(struct class_interface *);



extern struct class *class_create(struct module *owner, const char *name);

extern struct class * __must_check __class_create(struct module *owner,

						  const char *name,

						  struct lock_class_key *key);

extern void class_destroy(struct class *cls);



/* This is a #define to keep the compiler from merging different

 * instances of the __key variable */

#define class_create(owner, name)		\

({						\

	static struct lock_class_key __key;	\

	__class_create(owner, name, &__key);	\

})



/*

 * The type of device, "struct device" is embedded in. A class

 * or bus can contain devices of different types