Commit 886b7e80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-6.12-rc6' of... 

Merge tag 'driver-core-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core revert from Greg KH:
 "Here is a single driver core revert for 6.12-rc6. It reverts a change
  that came in -rc1 that was supposed to resolve a reported problem, but
  caused another one, so revert it for now so that we can get this all
  worked out properly in 6.13.

  The revert has been in linux-next all week with no reported issues"

* tag 'driver-core-6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Revert "driver core: Fix uevent_show() vs driver detach race"
parents be5bfa13 9a71892c

drivers/base/core.c

+5 −8
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/pm_runtime.h>

#include <linux/rcupdate.h>

#include <linux/sched/mm.h>

#include <linux/sched/signal.h>

#include <linux/slab.h>
@@ -2634,7 +2633,6 @@ static const char *dev_uevent_name(const struct kobject *kobj) 
static int dev_uevent(const struct kobject *kobj, struct kobj_uevent_env *env)

{

	const struct device *dev = kobj_to_dev(kobj);

	struct device_driver *driver;

	int retval = 0;



	/* add device node properties if present */
@@ -2663,12 +2661,8 @@ static int dev_uevent(const struct kobject *kobj, struct kobj_uevent_env *env) 
	if (dev->type && dev->type->name)

		add_uevent_var(env, "DEVTYPE=%s", dev->type->name);



	/* Synchronize with module_remove_driver() */

	rcu_read_lock();

	driver = READ_ONCE(dev->driver);

	if (driver)

		add_uevent_var(env, "DRIVER=%s", driver->name);

	rcu_read_unlock();

	if (dev->driver)

		add_uevent_var(env, "DRIVER=%s", dev->driver->name);



	/* Add common DT information about the device */

	of_device_uevent(dev, env);
@@ -2738,8 +2732,11 @@ static ssize_t uevent_show(struct device *dev, struct device_attribute *attr, 
	if (!env)

		return -ENOMEM;



	/* Synchronize with really_probe() */

	device_lock(dev);

	/* let the kset specific function add its keys */

	retval = kset->uevent_ops->uevent(&dev->kobj, env);

	device_unlock(dev);

	if (retval)

		goto out;

drivers/base/module.c

+0 −4
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <linux/errno.h>

#include <linux/slab.h>

#include <linux/string.h>

#include <linux/rcupdate.h>

#include "base.h"



static char *make_driver_name(const struct device_driver *drv)
@@ -102,9 +101,6 @@ void module_remove_driver(const struct device_driver *drv) 
	if (!drv)

		return;



	/* Synchronize with dev_uevent() */

	synchronize_rcu();



	sysfs_remove_link(&drv->p->kobj, "module");



	if (drv->owner)