Skip to contentSkip to conversation

More MODULE_ALIASes

PATCH In review Rusty Russell 2 participants 2 messages Dec 15, 2003 – Dec 16, 2003

Subsystems (2)
Network drivers Sound
lore
Share & tools
lore

Rusty Russell

author
#0 lore raw

PATCH 1/1 More MODULE_ALIASes

Three more MODULE_ALIASes. Trivial, but useful if people want things to "just work" in 2.6.0.

If you drop this I'll just keep collecting them.

Cheers,
Rusty.

Name: Aliases for Character Devices
Author: Steve Youngs, Stephen Hemminger
Status: Trivial

D: Add more MODULE_ALIASes where required.

sound/core/sound.c +2 -0
diff -urN -X dontdiff linux-2.6.0-test11/sound/core/sound.c linux-2.6.0-test11-sy/sound/core/sound.c
@@ -31,6 +31,7 @@
 #include <sound/initval.h>
 #include <linux/kmod.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
 
 #define SNDRV_OS_MINORS 256
 

@@ -52,6 +54,7 @@
 MODULE_PARM(cards_limit, "i");
 MODULE_PARM_DESC(cards_limit, "Count of soundcards installed in the system.");
 MODULE_PARM_SYNTAX(cards_limit, "default:8,skill:advanced");
+MODULE_ALIAS_CHARDEV_MAJOR(CONFIG_SND_MAJOR);
 #ifdef CONFIG_DEVFS_FS
 MODULE_PARM(device_mode, "i");
 MODULE_PARM_DESC(device_mode, "Device file permission mask for devfs.");
sound/sound_core.c +2 -0
diff -urN -X dontdiff linux-2.6.0-test11/sound/sound_core.c linux-2.6.0-test11-sy/sound/sound_core.c
@@ -45,6 +45,7 @@
 #include <linux/major.h>
 #include <linux/kmod.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/device.h>
 
 #define SOUND_STEP 16
 

@@ -547,6 +548,7 @@
 MODULE_DESCRIPTION("Core sound module");
 MODULE_AUTHOR("Alan Cox");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_CHARDEV_MAJOR(SOUND_MAJOR);
 
 static void __exit cleanup_soundcore(void)
 {
drivers/net/pppoe.c +1 -0
diff -Nru a/drivers/net/pppoe.c b/drivers/net/pppoe.c
@@ -1151,3 +1151,4 @@
 MODULE_AUTHOR("Michal Ostrowski <[email protected]>");
 MODULE_DESCRIPTION("PPP over Ethernet driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS_NETPROTO(PF_PPPOX);

--
Anyone who quotes me in their sig is an idiot. -- Rusty Russell.

#1 lore raw
Quoted 4 lines · Rusty Russell

Three more MODULE_ALIASes. Trivial, but useful if people want things to "just work" in 2.6.0.

If you drop this I'll just keep collecting them.

BTW, I'm reminding about aliases mentioned by me few weeks ago (here: http://www.ussg.iu.edu/hypermail/linux/kernel/0312.0/1263.html),
which could be built into appropriate modules (here in modprobe.conf format):

alias ppp-compress-21 bsd_comp
alias ppp-compress-24 ppp_deflate
alias ppp-compress-26 ppp_deflate
alias iso9660 isofs
alias block-major-11 sr_mod
alias char-major-21-* sg

Also note that MODULE_ALIAS_BLOCKDEV_MAJOR doesn't work up to test11, because for e.g. /dev/fd0 kernel calls modprobe with block-major-2 (in drivers/block/genhd.c?), but MODULE_ALIAS_BLOCKDEV_MAJOR(FLOPPY_MAJOR) adds "block-major-2-*" alias.
(similar problem with MODULE_ALIAS_CHARDEV_MAJOR was fixes few releases
ago by changing requet_module call in fs/chsr_dev.c - in 1.1414.1.23)

Signature · 2 lines
Jakub Bogusz    http://cyber.cs.net.pl/~qboosh/
PLD Linux       http://www.pld-linux.org/