Skip to contentSkip to conversation

char/impi: adding __init macro/ fix of __exit macro location in ipmi_poweroff.c

PATCH Applied Peter Hüwe 3 participants 3 messages Aug 22, 2009 – Aug 24, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 char/impi: adding __init macro/ fix of __exit macro location in ipmi_poweroff.c

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init to the module_init function of drivers/char/ipmi/ipmy_poweroff.c and corrects the location of __exit for the cleanup function.

According to ldd3, page 31 the __exit token hast to be after the return type. Or am I getting something wrong here?

Corey, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, So 23. Aug 01:38:43 CEST 2009

---

drivers/char/ipmi/ipmi_poweroff.c +2 -2
index a261bd7..2e66b5f 100644
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header;
 /*
  * Startup and shutdown functions.
  */
-static int ipmi_poweroff_init(void)
+static int __init ipmi_poweroff_init(void)
 {
 	int rv;
 
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void)
 }
 
 #ifdef MODULE
-static __exit void ipmi_poweroff_cleanup(void)
+static void __exit ipmi_poweroff_cleanup(void)
 {
 	int rv;
 
Acked-by on v1 1/1
#1 lore raw

This is correct, I'm fine with it going through the trivial tree. Thanks.

Quoted 40 lines · Peter Hüwe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init to the module_init function of drivers/char/ipmi/ipmy_poweroff.c and corrects the location of __exit for the cleanup function.

According to ldd3, page 31 the __exit token hast to be after the return type. Or am I getting something wrong here?

Corey, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, So 23. Aug 01:38:43 CEST 2009

---

drivers/char/ipmi/ipmi_poweroff.c +2 -3
index a261bd7..2e66b5f 100644
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header;
 /*
  * Startup and shutdown functions.
  */
-static int ipmi_poweroff_init(void)
+static int __init ipmi_poweroff_init(void)
 {
 	int rv;
 
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void)
 }
 
 #ifdef MODULE
-static __exit void ipmi_poweroff_cleanup(void)
+static void __exit ipmi_poweroff_cleanup(void)
 {
 	int rv;
 
 
------------------------------------------------------------------------------
Quoted 10 lines

Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day trial. Simplify your report design, integration and deployment - and focus on what you do best, core application coding. Discover what's new with Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Openipmi-developer mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/openipmi-developer

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Applied
#2 lore raw
Quoted 37 lines · Corey Minyard

This is correct, I'm fine with it going through the trivial tree. Thanks.

Quoted 32 lines · Peter Hüwe

From: Peter Huewe <[email protected]>

Trivial patch which adds the __init to the module_init function of drivers/char/ipmi/ipmy_poweroff.c and corrects the location of __exit for the
cleanup function.

According to ldd3, page 31 the __exit token hast to be after the return type.
Or am I getting something wrong here?

Corey, please have a look at the small patch and either pull it through your tree, or please ack' it so Jiri can pull it through the trivial tree.

linux version 2.6.31-rc6 - linus git tree, So 23. Aug 01:38:43 CEST 2009

---

drivers/char/ipmi/ipmi_poweroff.c +1 -1
index a261bd7..2e66b5f 100644
@@ -691,7 +691,7 @@ static struct ctl_table_header *ipmi_table_header;
 /*
  * Startup and shutdown functions.
  */
-static int ipmi_poweroff_init(void)
+static int __init ipmi_poweroff_init(void)
 {
  int rv;
 
Quoted 8 lines

drivers/char/ipmi/ipmi_poweroff.c static int ipmi_poweroff_init(void) · line 730

Quoted 8 lines
drivers/char/ipmi/ipmi_poweroff.c +1 -1
@@ -725,7 +725,7 @@ static int ipmi_poweroff_init(void)
 }
 
 #ifdef MODULE
-static __exit void ipmi_poweroff_cleanup(void)
+static void __exit ipmi_poweroff_cleanup(void)
 {
  int rv;

Applied, thanks.

Signature · 2 lines
Jiri Kosina
SUSE Labs