D34767.id104600.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D34767.id104600.diff
View Options

	diff --git a/sys/compat/linuxkpi/common/include/linux/kobject.h b/sys/compat/linuxkpi/common/include/linux/kobject.h
	--- a/sys/compat/linuxkpi/common/include/linux/kobject.h
	+++ b/sys/compat/linuxkpi/common/include/linux/kobject.h
	@@ -107,23 +107,11 @@
	return kobj;
	}

	+struct kobject *kobject_create(void);
	int kobject_set_name_vargs(struct kobject kobj, const char fmt, va_list);
	int kobject_add(struct kobject kobj, struct kobject parent,
	const char *fmt, ...);

	-static inline struct kobject *
	-kobject_create(void)
	-{
	- struct kobject *kobj;
	-
	- kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);
	- if (kobj == NULL)
	- return (NULL);
	- kobject_init(kobj, &linux_kfree_type);
	-
	- return (kobj);
	-}
	-
	static inline struct kobject *
	kobject_create_and_add(const char name, struct kobject parent)
	{
	diff --git a/sys/compat/linuxkpi/common/src/linux_compat.c b/sys/compat/linuxkpi/common/src/linux_compat.c
	--- a/sys/compat/linuxkpi/common/src/linux_compat.c
	+++ b/sys/compat/linuxkpi/common/src/linux_compat.c
	@@ -156,6 +156,20 @@
	INTERVAL_TREE_DEFINE(struct interval_tree_node, rb, unsigned long,, START,
	LAST,, lkpi_interval_tree)

	+struct kobject *
	+kobject_create(void)
	+{
	+ struct kobject *kobj;
	+
	+ kobj = kzalloc(sizeof(*kobj), GFP_KERNEL);
	+ if (kobj == NULL)
	+ return (NULL);
	+ kobject_init(kobj, &linux_kfree_type);
	+
	+ return (kobj);
	+}
	+
	+
	int
	kobject_set_name_vargs(struct kobject kobj, const char fmt, va_list args)
	{