lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] z2_init() in non-modular case

Browse Source 
... another victim - this time of 2.5.1-pre2

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Al Viro
2006-10-11 17:28:47 +01:00
committed by Linus Torvalds
parent 2db5f59ca7
commit f39d88adc5
1 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/block/z2ram.c
View File

@@ -329,7 +329,7 @@ static struct kobject *z2_find(dev_t dev, int *part, void *data)
static struct request_queue *z2_queue; static struct request_queue *z2_queue;
int __init static int __init
z2_init(void) z2_init(void)
{ {
int ret; int ret;
@@ -370,26 +370,7 @@ err:
return ret; return ret;
} }
#if defined(MODULE) static void __exit z2_exit(void)
MODULE_LICENSE("GPL");
int
init_module( void )
{
int error;
error = z2_init();
if ( error == 0 )
{
printk( KERN_INFO DEVICE_NAME ": loaded as module\n" );
}
return error;
}
void
cleanup_module( void )
{ {
int i, j; int i, j;
blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256); blk_unregister_region(MKDEV(Z2RAM_MAJOR, 0), 256);
@@ -425,4 +406,7 @@ cleanup_module( void )
return; return;
} }
#endif
module_init(z2_init);
module_exit(z2_exit);
MODULE_LICENSE("GPL");