Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2009-10-01 17:09:46 -07:00
parent 8b9f836c99 e02d23d347
commit 48cc6b6565
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
module/zpios/zpios.c
View File

@ -1241,7 +1241,7 @@ static struct cdev zpios_cdev = {
.kobj = { .name = ZPIOS_NAME, }, .kobj = { .name = ZPIOS_NAME, },
}; };
static int __init static int
zpios_init(void) zpios_init(void)
{ {
dev_t dev; dev_t dev;
@ -1278,7 +1278,7 @@ error:
return rc; return rc;
} }
static void static int
zpios_fini(void) zpios_fini(void)
{ {
dev_t dev = MKDEV(ZPIOS_MAJOR, 0); dev_t dev = MKDEV(ZPIOS_MAJOR, 0);
@ -1288,11 +1288,11 @@ zpios_fini(void)
cdev_del(&zpios_cdev); cdev_del(&zpios_cdev);
unregister_chrdev_region(dev, ZPIOS_MINORS); unregister_chrdev_region(dev, ZPIOS_MINORS);
return; return 0;
} }
module_init(zpios_init); spl_module_init(zpios_init);
module_exit(zpios_fini); spl_module_exit(zpios_fini);
MODULE_AUTHOR("LLNL / Sun"); MODULE_AUTHOR("LLNL / Sun");
MODULE_DESCRIPTION("Kernel PIOS implementation"); MODULE_DESCRIPTION("Kernel PIOS implementation");