ia64/xen-unstable

changeset 10038:60f7b567bb2b

Simply do not declare module_exit() handlers for netback/blkback, rather
than declaring the modules unsafe.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed May 10 16:47:00 2006 +0100 (2006-05-10)
parents b61908e30015
children 36e0159c001b
files linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c linux-2.6-xen-sparse/drivers/xen/netback/netback.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed May 10 16:23:22 2006 +0100
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c	Wed May 10 16:47:00 2006 +0100
     1.3 @@ -571,19 +571,12 @@ static int __init blkif_init(void)
     1.4  		list_add_tail(&pending_reqs[i].free_list, &pending_free);
     1.5      
     1.6  	blkif_xenbus_init();
     1.7 -	__unsafe(THIS_MODULE);
     1.8 +
     1.9  	return 0;
    1.10  }
    1.11  
    1.12  module_init(blkif_init);
    1.13  
    1.14 -static void blkif_exit(void)
    1.15 -{
    1.16 -	BUG();
    1.17 -}
    1.18 -
    1.19 -module_exit(blkif_exit);
    1.20 -
    1.21  MODULE_LICENSE("Dual BSD/GPL");
    1.22  
    1.23  /*
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed May 10 16:23:22 2006 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c	Wed May 10 16:47:00 2006 +0100
     2.3 @@ -849,18 +849,10 @@ static int __init netback_init(void)
     2.4  		&netif_be_dbg);
     2.5  #endif
     2.6  
     2.7 -	__unsafe(THIS_MODULE);
     2.8 -
     2.9  	return 0;
    2.10  }
    2.11  
    2.12 -static void netback_cleanup(void)
    2.13 -{
    2.14 -	BUG();
    2.15 -}
    2.16 -
    2.17  module_init(netback_init);
    2.18 -module_exit(netback_cleanup);
    2.19  
    2.20  MODULE_LICENSE("Dual BSD/GPL");
    2.21