lkml.org 
[lkml]   [2006]   [May]   [5]   [last100]   RSS Feed
Views: [more markup]  [less markup]  [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH, 2.6.17-rc3-currentgit] jffs2: fix __init usage
FromStelian Pop <>
DateFri, 05 May 2006 12:26:31 +0200
Hi,

Compiling jffs2 as a module gives: 
	WARNING: fs/jffs2/jffs2.o - Section mismatch: reference to
	.init.text:jffs2_zlib_init from .text between 
	'jffs2_compressors_init' (at offset 0xa0) and 'jffs2_compressors_exit'

The attached patch fixes that by adding the correct __init tags to
jffs2_compressors_init() and each compressor initialisation functions.

Signed-off-by: Stelian Pop <stelian@popies.net>

---
 compr.c       |    2 +-
 compr_rtime.c |    2 +-
 compr_rubin.c |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)
diff -r 8d66b80a7a7c fs/jffs2/compr.c
--- a/fs/jffs2/compr.c	Fri May  5 10:50:10 2006 +0200
+++ b/fs/jffs2/compr.c	Fri May  5 11:17:03 2006 +0200
@@ -412,7 +412,7 @@ void jffs2_free_comprbuf(unsigned char *
                 kfree(comprbuf);
 }
 
-int jffs2_compressors_init(void)
+int __init jffs2_compressors_init(void)
 {
 /* Registering compressors */
 #ifdef CONFIG_JFFS2_ZLIB
diff -r 8d66b80a7a7c fs/jffs2/compr_rtime.c
--- a/fs/jffs2/compr_rtime.c	Fri May  5 10:50:10 2006 +0200
+++ b/fs/jffs2/compr_rtime.c	Fri May  5 11:17:03 2006 +0200
@@ -121,7 +121,7 @@ static struct jffs2_compressor jffs2_rti
 #endif
 };
 
-int jffs2_rtime_init(void)
+int __init jffs2_rtime_init(void)
 {
     return jffs2_register_compressor(&jffs2_rtime_comp);
 }
diff -r 8d66b80a7a7c fs/jffs2/compr_rubin.c
--- a/fs/jffs2/compr_rubin.c	Fri May  5 10:50:10 2006 +0200
+++ b/fs/jffs2/compr_rubin.c	Fri May  5 11:17:03 2006 +0200
@@ -344,7 +344,7 @@ static struct jffs2_compressor jffs2_rub
 #endif
 };
 
-int jffs2_rubinmips_init(void)
+int __init jffs2_rubinmips_init(void)
 {
     return jffs2_register_compressor(&jffs2_rubinmips_comp);
 }
@@ -367,7 +367,7 @@ static struct jffs2_compressor jffs2_dyn
 #endif
 };
 
-int jffs2_dynrubin_init(void)
+int __init jffs2_dynrubin_init(void)
 {
     return jffs2_register_compressor(&jffs2_dynrubin_comp);
 }

-- 
Stelian Pop <stelian@popies.net>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2006-05-05 10:29    [from the cache]
©2003-2008