diff --git a/kernel/brick.c b/kernel/brick.c index d60a3709..2c489616 100644 --- a/kernel/brick.c +++ b/kernel/brick.c @@ -670,7 +670,7 @@ int __init init_brick(void) return 0; } -void __exit exit_brick(void) +void exit_brick(void) { if (nr_table) { brick_mem_free(nr_table); diff --git a/kernel/brick.h b/kernel/brick.h index 7b407cb9..e6831a67 100644 --- a/kernel/brick.h +++ b/kernel/brick.h @@ -672,11 +672,6 @@ extern void brick_thread_stop_nowait(struct task_struct *k); // init -#ifdef CONFIG_MARS_HAVE_BIGMODULE -#undef __exit -#define __exit /*empty*/ -#endif - extern int init_brick(void); extern void exit_brick(void); diff --git a/kernel/brick_mem.c b/kernel/brick_mem.c index 56aacecf..1e3ec6c1 100644 --- a/kernel/brick_mem.c +++ b/kernel/brick_mem.c @@ -1005,7 +1005,7 @@ int __init init_brick_mem(void) return 0; } -void __exit exit_brick_mem(void) +void exit_brick_mem(void) { BRICK_INF("deallocating memory...\n"); #ifdef CONFIG_MARS_MEM_PREALLOC diff --git a/kernel/brick_mem.h b/kernel/brick_mem.h index 5b7292d7..1a946e10 100644 --- a/kernel/brick_mem.h +++ b/kernel/brick_mem.h @@ -206,11 +206,6 @@ extern void brick_mem_statistics(bool final); // init -#ifdef CONFIG_MARS_HAVE_BIGMODULE -#undef __exit -#define __exit /*empty*/ -#endif - extern int init_brick_mem(void); extern void exit_brick_mem(void); diff --git a/kernel/lib_log.c b/kernel/lib_log.c index a0cb20c7..284e4ad8 100644 --- a/kernel/lib_log.c +++ b/kernel/lib_log.c @@ -504,7 +504,7 @@ int __init init_log_format(void) return 0; } -void __exit exit_log_format(void) +void exit_log_format(void) { MARS_INF("exit_log_format()\n"); } diff --git a/kernel/lib_mapfree.c b/kernel/lib_mapfree.c index 54456264..accdffb3 100644 --- a/kernel/lib_mapfree.c +++ b/kernel/lib_mapfree.c @@ -355,7 +355,7 @@ int __init init_mars_mapfree(void) return 0; } -void __exit exit_mars_mapfree(void) +void exit_mars_mapfree(void) { MARS_DBG("exit_mapfree()\n"); if (likely(mf_thread)) { diff --git a/kernel/lib_mapfree.h b/kernel/lib_mapfree.h index 2a0de857..0ce74055 100644 --- a/kernel/lib_mapfree.h +++ b/kernel/lib_mapfree.h @@ -60,6 +60,6 @@ void mf_get_any_dirty(const char *filename, loff_t *min, loff_t *max, int min_st int __init init_mars_mapfree(void); -void __exit exit_mars_mapfree(void); +void exit_mars_mapfree(void); #endif diff --git a/kernel/mars_aio.c b/kernel/mars_aio.c index 4293e186..52f55bb9 100644 --- a/kernel/mars_aio.c +++ b/kernel/mars_aio.c @@ -1190,7 +1190,7 @@ int __init init_mars_aio(void) return aio_register_brick_type(); } -void __exit exit_mars_aio(void) +void exit_mars_aio(void) { MARS_DBG("exit_aio()\n"); aio_unregister_brick_type(); diff --git a/kernel/mars_bio.c b/kernel/mars_bio.c index f1f63f0d..ac9c0415 100644 --- a/kernel/mars_bio.c +++ b/kernel/mars_bio.c @@ -914,7 +914,7 @@ int __init init_mars_bio(void) return bio_register_brick_type(); } -void __exit exit_mars_bio(void) +void exit_mars_bio(void) { MARS_INF("exit_bio()\n"); bio_unregister_brick_type(); diff --git a/kernel/mars_buf.c b/kernel/mars_buf.c index 6e283e30..174a64a4 100644 --- a/kernel/mars_buf.c +++ b/kernel/mars_buf.c @@ -1118,7 +1118,7 @@ int __init init_mars_buf(void) return buf_register_brick_type(); } -void __exit exit_mars_buf(void) +void exit_mars_buf(void) { MARS_INF("exit_buf()\n"); buf_unregister_brick_type(); diff --git a/kernel/mars_check.c b/kernel/mars_check.c index 16780970..bd0124a3 100644 --- a/kernel/mars_check.c +++ b/kernel/mars_check.c @@ -331,7 +331,7 @@ int __init init_mars_check(void) return check_register_brick_type(); } -void __exit exit_mars_check(void) +void exit_mars_check(void) { MARS_INF("exit_check()\n"); check_unregister_brick_type(); diff --git a/kernel/mars_client.c b/kernel/mars_client.c index a1119289..f0a2e579 100644 --- a/kernel/mars_client.c +++ b/kernel/mars_client.c @@ -779,7 +779,7 @@ int __init init_mars_client(void) return client_register_brick_type(); } -void __exit exit_mars_client(void) +void exit_mars_client(void) { MARS_INF("exit_client()\n"); client_unregister_brick_type(); diff --git a/kernel/mars_copy.c b/kernel/mars_copy.c index 977d9920..769309a7 100644 --- a/kernel/mars_copy.c +++ b/kernel/mars_copy.c @@ -1019,7 +1019,7 @@ int __init init_mars_copy(void) return copy_register_brick_type(); } -void __exit exit_mars_copy(void) +void exit_mars_copy(void) { MARS_INF("exit_copy()\n"); copy_unregister_brick_type(); diff --git a/kernel/mars_dummy.c b/kernel/mars_dummy.c index a89c1cc1..d6b21f5f 100644 --- a/kernel/mars_dummy.c +++ b/kernel/mars_dummy.c @@ -209,7 +209,7 @@ int __init init_mars_dummy(void) return dummy_register_brick_type(); } -void __exit exit_mars_dummy(void) +void exit_mars_dummy(void) { MARS_INF("exit_dummy()\n"); dummy_unregister_brick_type(); diff --git a/kernel/mars_generic.c b/kernel/mars_generic.c index b8ac9dac..48753d01 100644 --- a/kernel/mars_generic.c +++ b/kernel/mars_generic.c @@ -332,7 +332,7 @@ int __init init_mars(void) return 0; } -void __exit exit_mars(void) +void exit_mars(void) { MARS_INF("exit_mars()\n"); diff --git a/kernel/mars_if.c b/kernel/mars_if.c index 5df4afa9..f54025e6 100644 --- a/kernel/mars_if.c +++ b/kernel/mars_if.c @@ -1178,7 +1178,7 @@ EXPORT_SYMBOL_GPL(if_brick_type); ////////////////// module init stuff ///////////////////////// -void __exit exit_mars_if(void) +void exit_mars_if(void) { int status; MARS_INF("exit_if()\n"); diff --git a/kernel/mars_net.c b/kernel/mars_net.c index 146bc60b..7acd223c 100644 --- a/kernel/mars_net.c +++ b/kernel/mars_net.c @@ -1139,7 +1139,7 @@ int __init init_mars_net(void) return 0; } -void __exit exit_mars_net(void) +void exit_mars_net(void) { mars_net_is_alive = false; MARS_INF("exit_net()\n"); diff --git a/kernel/mars_server.c b/kernel/mars_server.c index fcc7be0e..1810f248 100644 --- a/kernel/mars_server.c +++ b/kernel/mars_server.c @@ -814,7 +814,7 @@ struct mars_limiter server_limiter = { }; EXPORT_SYMBOL_GPL(server_limiter); -void __exit exit_mars_server(void) +void exit_mars_server(void) { int i; diff --git a/kernel/mars_sio.c b/kernel/mars_sio.c index 094d7ff2..fe37d338 100644 --- a/kernel/mars_sio.c +++ b/kernel/mars_sio.c @@ -715,7 +715,7 @@ int __init init_mars_sio(void) return sio_register_brick_type(); } -void __exit exit_mars_sio(void) +void exit_mars_sio(void) { MARS_INF("exit_sio()\n"); sio_unregister_brick_type(); diff --git a/kernel/mars_trans_logger.c b/kernel/mars_trans_logger.c index 54395464..bed0cd5b 100644 --- a/kernel/mars_trans_logger.c +++ b/kernel/mars_trans_logger.c @@ -3471,7 +3471,7 @@ int __init init_mars_trans_logger(void) return trans_logger_register_brick_type(); } -void __exit exit_mars_trans_logger(void) +void exit_mars_trans_logger(void) { MARS_INF("exit_trans_logger()\n"); trans_logger_unregister_brick_type(); diff --git a/kernel/mars_usebuf.c b/kernel/mars_usebuf.c index 9abc15a2..87a75bfa 100644 --- a/kernel/mars_usebuf.c +++ b/kernel/mars_usebuf.c @@ -362,7 +362,7 @@ int __init init_mars_usebuf(void) return usebuf_register_brick_type(); } -void __exit exit_mars_usebuf(void) +void exit_mars_usebuf(void) { MARS_INF("exit_usebuf()\n"); usebuf_unregister_brick_type(); diff --git a/kernel/sy_old/mars_light.c b/kernel/sy_old/mars_light.c index d5e623e9..bc7f05dd 100644 --- a/kernel/sy_old/mars_light.c +++ b/kernel/sy_old/mars_light.c @@ -5343,7 +5343,7 @@ static int exit_fn_nr = 0; void (*_mars_remote_trigger)(void); EXPORT_SYMBOL_GPL(_mars_remote_trigger); -static void __exit exit_light(void) +static void exit_light(void) { MARS_DBG("====================== stopping everything...\n"); // TODO: make this thread-safe. diff --git a/kernel/sy_old/mars_proc.c b/kernel/sy_old/mars_proc.c index 779c049d..16ec5a27 100644 --- a/kernel/sy_old/mars_proc.c +++ b/kernel/sy_old/mars_proc.c @@ -372,7 +372,7 @@ int __init init_mars_proc(void) return 0; } -void __exit exit_mars_proc(void) +void exit_mars_proc(void) { MARS_INF("exit_proc()\n"); if (header) { diff --git a/kernel/sy_old/sy_generic.c b/kernel/sy_old/sy_generic.c index 373f0682..d7a633e1 100644 --- a/kernel/sy_old/sy_generic.c +++ b/kernel/sy_old/sy_generic.c @@ -1902,7 +1902,7 @@ int __init init_sy(void) return 0; } -void __exit exit_sy(void) +void exit_sy(void) { MARS_INF("exit_sy()\n"); } diff --git a/kernel/sy_old/sy_net.c b/kernel/sy_old/sy_net.c index 175af922..bbba7942 100644 --- a/kernel/sy_old/sy_net.c +++ b/kernel/sy_old/sy_net.c @@ -103,7 +103,7 @@ int __init init_sy_net(void) return 0; } -void __exit exit_sy_net(void) +void exit_sy_net(void) { MARS_INF("exit_sy_net()\n"); }