13 files changed, 28 insertions, 13 deletions
diff --git a/accel-pppd/ppp/ccp_mppe.c b/accel-pppd/ppp/ccp_mppe.c
index 9c3febe2..58f5d4f2 100644
--- a/accel-pppd/ppp/ccp_mppe.c
+++ b/accel-pppd/ppp/ccp_mppe.c
@@ -289,7 +289,7 @@ static void load_config(void)
 		conf_mppe = -1;
 }
 
-static void __init mppe_opt_init()
+static void mppe_opt_init()
 {
 	ccp_option_register(&mppe_opt_hnd);
 	triton_event_register_handler(EV_MPPE_KEYS, (triton_event_func)ev_mppe_keys);
@@ -298,3 +298,4 @@ static void __init mppe_opt_init()
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(4, mppe_opt_init);
diff --git a/accel-pppd/ppp/ipcp_opt_dns.c b/accel-pppd/ppp/ipcp_opt_dns.c
index f488f3ce..4427b0ec 100644
--- a/accel-pppd/ppp/ipcp_opt_dns.c
+++ b/accel-pppd/ppp/ipcp_opt_dns.c
@@ -152,7 +152,7 @@ static void load_config(void)
 		conf_dns2 = inet_addr(opt);
 }
 
-static void __init dns_opt_init()
+static void dns_opt_init()
 {
 	ipcp_option_register(&dns1_opt_hnd);
 	ipcp_option_register(&dns2_opt_hnd);
@@ -160,3 +160,5 @@ static void __init dns_opt_init()
 	load_config();
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
+
+DEFINE_INIT(4, dns_opt_init);
diff --git a/accel-pppd/ppp/ipcp_opt_ipaddr.c b/accel-pppd/ppp/ipcp_opt_ipaddr.c
index ed0de517..388df199 100644
--- a/accel-pppd/ppp/ipcp_opt_ipaddr.c
+++ b/accel-pppd/ppp/ipcp_opt_ipaddr.c
@@ -216,7 +216,7 @@ static void load_config(void)
 		conf_check_exists = 1;
 }
 
-static void __init ipaddr_opt_init()
+static void ipaddr_opt_init()
 {
 	ipcp_option_register(&ipaddr_opt_hnd);
 	load_config();
@@ -224,3 +224,4 @@ static void __init ipaddr_opt_init()
 	triton_event_register_handler(EV_PPP_STARTED, (triton_event_func)if_up);
 }
 
+DEFINE_INIT(4, ipaddr_opt_init);
diff --git a/accel-pppd/ppp/lcp_opt_accomp.c b/accel-pppd/ppp/lcp_opt_accomp.c
index 241b0e06..33347d88 100644
--- a/accel-pppd/ppp/lcp_opt_accomp.c
+++ b/accel-pppd/ppp/lcp_opt_accomp.c
@@ -99,8 +99,9 @@ static void accomp_print(void (*print)(const char *fmt,...),struct lcp_option_t
 	print("<accomp>");
 }
 
-static void __init accomp_opt_init()
+static void accomp_opt_init()
 {
 	lcp_option_register(&accomp_opt_hnd);
 }
 
+DEFINE_INIT(4, accomp_opt_init);
diff --git a/accel-pppd/ppp/lcp_opt_magic.c b/accel-pppd/ppp/lcp_opt_magic.c
index 6c0deb54..3e694d20 100644
--- a/accel-pppd/ppp/lcp_opt_magic.c
+++ b/accel-pppd/ppp/lcp_opt_magic.c
@@ -99,7 +99,9 @@ static void magic_print(void (*print)(const char *fmt,...),struct lcp_option_t *
 		print("<magic %04x>", magic_opt->magic);
 }
 
-static void __init magic_opt_init()
+static void magic_opt_init()
 {
 	lcp_option_register(&magic_opt_hnd);
 }
+
+DEFINE_INIT(4, magic_opt_init);
diff --git a/accel-pppd/ppp/lcp_opt_mru.c b/accel-pppd/ppp/lcp_opt_mru.c
index 78e06b5a..577e0191 100644
--- a/accel-pppd/ppp/lcp_opt_mru.c
+++ b/accel-pppd/ppp/lcp_opt_mru.c
@@ -186,10 +186,11 @@ static void load_config(void)
 	}
 }
 
-static void __init mru_opt_init()
+static void mru_opt_init()
 {
 	load_config();
 	lcp_option_register(&mru_opt_hnd);
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(4, mru_opt_init);
diff --git a/accel-pppd/ppp/lcp_opt_pcomp.c b/accel-pppd/ppp/lcp_opt_pcomp.c
index 1f8532bb..fec5e7b8 100644
--- a/accel-pppd/ppp/lcp_opt_pcomp.c
+++ b/accel-pppd/ppp/lcp_opt_pcomp.c
@@ -99,8 +99,9 @@ static void pcomp_print(void (*print)(const char *fmt,...),struct lcp_option_t *
 	print("<pcomp>");
 }
 
-static void __init pcomp_opt_init()
+static void pcomp_opt_init()
 {
 	lcp_option_register(&pcomp_opt_hnd);
 }
 
+DEFINE_INIT(4, pcomp_opt_init);
diff --git a/accel-pppd/ppp/ppp.c b/accel-pppd/ppp/ppp.c
index 5a4006cf..e62107f6 100644
--- a/accel-pppd/ppp/ppp.c
+++ b/accel-pppd/ppp/ppp.c
@@ -652,7 +652,7 @@ static void load_config(void)
 		conf_single_session = -1;
 }
 
-static void __init init(void)
+static void init(void)
 {
 	char *opt;
 	FILE *f;
@@ -682,3 +682,4 @@ static void __init init(void)
 	atexit(save_seq);
 }
 
+DEFINE_INIT(2, init);
diff --git a/accel-pppd/ppp/ppp_auth.c b/accel-pppd/ppp/ppp_auth.c
index c67b4e26..e02d8c1e 100644
--- a/accel-pppd/ppp/ppp_auth.c
+++ b/accel-pppd/ppp/ppp_auth.c
@@ -372,9 +372,10 @@ int __export ppp_auth_restart(struct ppp_t *ppp)
 	return 0;
 }
 
-static void __init ppp_auth_init()
+static void ppp_auth_init()
 {
 	ppp_register_layer("auth", &auth_layer);
 	lcp_option_register(&auth_opt_hnd);
 }
 
+DEFINE_INIT(3, ppp_auth_init);
diff --git a/accel-pppd/ppp/ppp_ccp.c b/accel-pppd/ppp/ppp_ccp.c
index 5a5d6f14..7c191915 100644
--- a/accel-pppd/ppp/ppp_ccp.c
+++ b/accel-pppd/ppp/ppp_ccp.c
@@ -762,7 +762,7 @@ static void load_config(void)
 		conf_ccp = atoi(opt);
 }
 
-static void __init ccp_init(void)
+static void ccp_init(void)
 {
 	ppp_register_layer("ccp", &ccp_layer);
 
@@ -770,3 +770,4 @@ static void __init ccp_init(void)
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(3, ccp_init);
diff --git a/accel-pppd/ppp/ppp_fsm.c b/accel-pppd/ppp/ppp_fsm.c
index 01427a61..180b30e9 100644
--- a/accel-pppd/ppp/ppp_fsm.c
+++ b/accel-pppd/ppp/ppp_fsm.c
@@ -538,9 +538,10 @@ static void load_config(void)
 		conf_timeout = atoi(opt);
 }
 
-void __init fsm_init(void)
+static void fsm_init(void)
 {
 	load_config();
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(3, fsm_init);
diff --git a/accel-pppd/ppp/ppp_ipcp.c b/accel-pppd/ppp/ppp_ipcp.c
index 72760d57..39627026 100644
--- a/accel-pppd/ppp/ppp_ipcp.c
+++ b/accel-pppd/ppp/ppp_ipcp.c
@@ -688,8 +688,9 @@ static struct ppp_layer_t ipcp_layer =
 	.free   = ipcp_layer_free,
 };
 
-static void __init ipcp_init(void)
+static void ipcp_init(void)
 {
 	ppp_register_layer("ipcp", &ipcp_layer);
 }
 
+DEFINE_INIT(3, ipcp_init);
diff --git a/accel-pppd/ppp/ppp_lcp.c b/accel-pppd/ppp/ppp_lcp.c
index 56a3ca64..048ada5f 100644
--- a/accel-pppd/ppp/ppp_lcp.c
+++ b/accel-pppd/ppp/ppp_lcp.c
@@ -845,7 +845,7 @@ static void load_config(void)
 		conf_echo_failure = atoi(opt);
 }
 
-static void __init lcp_init(void)
+static void lcp_init(void)
 {
 	load_config();
 
@@ -854,3 +854,4 @@ static void __init lcp_init(void)
 	triton_event_register_handler(EV_CONFIG_RELOAD, (triton_event_func)load_config);
 }
 
+DEFINE_INIT(3, lcp_init);