Commit b142ebb6 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:
  driver core: add devname module aliases to allow module on-demand auto-loading
parents 218ce735 578454ff

Documentation/devices.txt

+2 −0
Original line number Diff line number Diff line
@@ -443,6 +443,8 @@ Your cooperation is appreciated. 
		231 = /dev/snapshot	System memory snapshot device

		232 = /dev/kvm		Kernel-based virtual machine (hardware virtualization extensions)

		233 = /dev/kmview	View-OS A process with a view

		234 = /dev/btrfs-control	Btrfs control device

		235 = /dev/autofs	Autofs control device

		240-254			Reserved for local use

		255			Reserved for MISC_DYNAMIC_MINOR

arch/x86/kernel/microcode_core.c

+1 −0
Original line number Diff line number Diff line
@@ -260,6 +260,7 @@ static void microcode_dev_exit(void) 
}



MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);

MODULE_ALIAS("devname:cpu/microcode");

#else

#define microcode_dev_init()	0

#define microcode_dev_exit()	do { } while (0)

drivers/net/ppp_generic.c

+2 −2
Original line number Diff line number Diff line
@@ -2926,5 +2926,5 @@ EXPORT_SYMBOL(ppp_output_wakeup); 
EXPORT_SYMBOL(ppp_register_compressor);

EXPORT_SYMBOL(ppp_unregister_compressor);

MODULE_LICENSE("GPL");

MODULE_ALIAS_CHARDEV_MAJOR(PPP_MAJOR);

MODULE_ALIAS("/dev/ppp");
 
MODULE_ALIAS_CHARDEV(PPP_MAJOR, 0);

MODULE_ALIAS("devname:ppp");

drivers/net/tun.c

+1 −0
Original line number Diff line number Diff line
@@ -1649,3 +1649,4 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); 
MODULE_AUTHOR(DRV_COPYRIGHT);

MODULE_LICENSE("GPL");

MODULE_ALIAS_MISCDEV(TUN_MINOR);

MODULE_ALIAS("devname:net/tun");

fs/autofs4/dev-ioctl.c

+4 −1
Original line number Diff line number Diff line
@@ -736,11 +736,14 @@ static const struct file_operations _dev_ioctl_fops = { 
};



static struct miscdevice _autofs_dev_ioctl_misc = {

	.minor 		= MISC_DYNAMIC_MINOR,

	.minor		= AUTOFS_MINOR,

	.name  		= AUTOFS_DEVICE_NAME,

	.fops  		= &_dev_ioctl_fops

};



MODULE_ALIAS_MISCDEV(AUTOFS_MINOR);

MODULE_ALIAS("devname:autofs");



/* Register/deregister misc character device */

int autofs_dev_ioctl_init(void)

{