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

Commit c813b4e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6: (46 commits)
  UIO: Fix mapping of logical and virtual memory
  UIO: add automata sercos3 pci card support
  UIO: Change driver name of uio_pdrv
  UIO: Add alignment warnings for uio-mem
  Driver core: add bus_sort_breadthfirst() function
  NET: convert the phy_device file to use bus_find_device_by_name
  kobject: Cleanup kobject_rename and !CONFIG_SYSFS
  kobject: Fix kobject_rename and !CONFIG_SYSFS
  sysfs: Make dir and name args to sysfs_notify() const
  platform: add new device registration helper
  sysfs: use ilookup5() instead of ilookup5_nowait()
  PNP: create device attributes via default device attributes
  Driver core: make bus_find_device_by_name() more robust
  usb: turn dev_warn+WARN_ON combos into dev_WARN
  debug: use dev_WARN() rather than WARN_ON() in device_pm_add()
  debug: Introduce a dev_WARN() function
  sysfs: fix deadlock
  device model: Do a quickcheck for driver binding before doing an expensive check
  Driver core: Fix cleanup in device_create_vargs().
  Driver core: Clarify device cleanup.
  ...
parents c8d8a232 02683ffd

Documentation/kernel-parameters.txt

+5 −0
Original line number Original line Diff line number Diff line
@@ -1714,6 +1714,11 @@ and is between 256 and 4096 characters. It is defined in the file 
			autoconfiguration.

			autoconfiguration.

			Ranges are in pairs (memory base and size).

			Ranges are in pairs (memory base and size).





	dynamic_printk

			Enables pr_debug()/dev_dbg() calls if

			CONFIG_DYNAMIC_PRINTK_DEBUG has been enabled. These can also

			be switched on/off via <debugfs>/dynamic_printk/modules



	print-fatal-signals=

	print-fatal-signals=

			[KNL] debug: print fatal signals

			[KNL] debug: print fatal signals

			print-fatal-signals=1: print segfault info to

			print-fatal-signals=1: print segfault info to

Documentation/kobject.txt

+4 −0
Original line number Original line Diff line number Diff line
@@ -118,6 +118,10 @@ the name of the kobject, call kobject_rename(): 




    int kobject_rename(struct kobject *kobj, const char *new_name);

    int kobject_rename(struct kobject *kobj, const char *new_name);





Note kobject_rename does perform any locking or have a solid notion of

what names are valid so the provide must provide their own sanity checking

and serialization.



There is a function called kobject_set_name() but that is legacy cruft and

There is a function called kobject_set_name() but that is legacy cruft and

is being removed.  If your code needs to call this function, it is

is being removed.  If your code needs to call this function, it is

incorrect and needs to be fixed.

incorrect and needs to be fixed.

arch/mips/kernel/rtlx.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -522,8 +522,8 @@ static int __init rtlx_module_init(void) 
		atomic_set(&channel_wqs[i].in_open, 0);

		atomic_set(&channel_wqs[i].in_open, 0);

		mutex_init(&channel_wqs[i].mutex);

		mutex_init(&channel_wqs[i].mutex);





		dev = device_create_drvdata(mt_class, NULL, MKDEV(major, i),

		dev = device_create(mt_class, NULL, MKDEV(major, i), NULL,

					    NULL, "%s%d", module_name, i);

				    "%s%d", module_name, i);

		if (IS_ERR(dev)) {

		if (IS_ERR(dev)) {

			err = PTR_ERR(dev);

			err = PTR_ERR(dev);

			goto out_chrdev;

			goto out_chrdev;

arch/mips/sibyte/common/sb_tbprof.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -576,8 +576,7 @@ static int __init sbprof_tb_init(void) 




	tb_class = tbc;

	tb_class = tbc;





	dev = device_create_drvdata(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0),

	dev = device_create(tbc, NULL, MKDEV(SBPROF_TB_MAJOR, 0), NULL, "tb");

				    NULL, "tb");

	if (IS_ERR(dev)) {

	if (IS_ERR(dev)) {

		err = PTR_ERR(dev);

		err = PTR_ERR(dev);

		goto out_class;

		goto out_class;

arch/x86/kernel/cpuid.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -147,8 +147,8 @@ static __cpuinit int cpuid_device_create(int cpu) 
{

{

	struct device *dev;

	struct device *dev;





	dev = device_create_drvdata(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu),

	dev = device_create(cpuid_class, NULL, MKDEV(CPUID_MAJOR, cpu), NULL,

				    NULL, "cpu%d", cpu);

			    "cpu%d", cpu);

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

	return IS_ERR(dev) ? PTR_ERR(dev) : 0;

}

}