The patch titled
fix static linking of NFS
has been added to the -mm tree. Its filename is
fix-static-linking-of-nfs.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: fix static linking of NFS
From: David Brownell <david-b@xxxxxxxxxxx>
Builds on ARM report link problems with common configurations like
statically linked NFS (for nfsroot). The symptom is that __init section
code references __exit section code; that won't work since the exit
sections are discarded (since they can never be called).
The best fix for these particular cases would be an "__init_or_exit"
section annotation.
Signed-off-by: David Brownell <dbrownell@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Trond Myklebust <trond.myklebust@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/nfs/direct.c | 2 +-
fs/nfs/inode.c | 2 +-
fs/nfs/internal.h | 8 ++++----
fs/nfs/pagelist.c | 2 +-
fs/nfs/read.c | 2 +-
fs/nfs/write.c | 2 +-
6 files changed, 9 insertions(+), 9 deletions(-)
diff -puN fs/nfs/direct.c~fix-static-linking-of-nfs fs/nfs/direct.c
--- a/fs/nfs/direct.c~fix-static-linking-of-nfs
+++ a/fs/nfs/direct.c
@@ -909,7 +909,7 @@ int __init nfs_init_directcache(void)
* nfs_destroy_directcache - destroy the slab cache for nfs_direct_req structures
*
*/
-void __exit nfs_destroy_directcache(void)
+void nfs_destroy_directcache(void)
{
if (kmem_cache_destroy(nfs_direct_cachep))
printk(KERN_INFO "nfs_direct_cache: not all structures were freed\n");
diff -puN fs/nfs/inode.c~fix-static-linking-of-nfs fs/nfs/inode.c
--- a/fs/nfs/inode.c~fix-static-linking-of-nfs
+++ a/fs/nfs/inode.c
@@ -1132,7 +1132,7 @@ static int __init nfs_init_inodecache(vo
return 0;
}
-static void __exit nfs_destroy_inodecache(void)
+static void nfs_destroy_inodecache(void)
{
if (kmem_cache_destroy(nfs_inode_cachep))
printk(KERN_INFO "nfs_inode_cache: not all structures were freed\n");
diff -puN fs/nfs/internal.h~fix-static-linking-of-nfs fs/nfs/internal.h
--- a/fs/nfs/internal.h~fix-static-linking-of-nfs
+++ a/fs/nfs/internal.h
@@ -31,15 +31,15 @@ extern struct svc_version nfs4_callback_
/* pagelist.c */
extern int __init nfs_init_nfspagecache(void);
-extern void __exit nfs_destroy_nfspagecache(void);
+extern void nfs_destroy_nfspagecache(void);
extern int __init nfs_init_readpagecache(void);
-extern void __exit nfs_destroy_readpagecache(void);
+extern void nfs_destroy_readpagecache(void);
extern int __init nfs_init_writepagecache(void);
-extern void __exit nfs_destroy_writepagecache(void);
+extern void nfs_destroy_writepagecache(void);
#ifdef CONFIG_NFS_DIRECTIO
extern int __init nfs_init_directcache(void);
-extern void __exit nfs_destroy_directcache(void);
+extern void nfs_destroy_directcache(void);
#else
#define nfs_init_directcache() (0)
#define nfs_destroy_directcache() do {} while(0)
diff -puN fs/nfs/pagelist.c~fix-static-linking-of-nfs fs/nfs/pagelist.c
--- a/fs/nfs/pagelist.c~fix-static-linking-of-nfs
+++ a/fs/nfs/pagelist.c
@@ -390,7 +390,7 @@ int __init nfs_init_nfspagecache(void)
return 0;
}
-void __exit nfs_destroy_nfspagecache(void)
+void nfs_destroy_nfspagecache(void)
{
if (kmem_cache_destroy(nfs_page_cachep))
printk(KERN_INFO "nfs_page: not all structures were freed\n");
diff -puN fs/nfs/read.c~fix-static-linking-of-nfs fs/nfs/read.c
--- a/fs/nfs/read.c~fix-static-linking-of-nfs
+++ a/fs/nfs/read.c
@@ -711,7 +711,7 @@ int __init nfs_init_readpagecache(void)
return 0;
}
-void __exit nfs_destroy_readpagecache(void)
+void nfs_destroy_readpagecache(void)
{
mempool_destroy(nfs_rdata_mempool);
if (kmem_cache_destroy(nfs_rdata_cachep))
diff -puN fs/nfs/write.c~fix-static-linking-of-nfs fs/nfs/write.c
--- a/fs/nfs/write.c~fix-static-linking-of-nfs
+++ a/fs/nfs/write.c
@@ -1551,7 +1551,7 @@ int __init nfs_init_writepagecache(void)
return 0;
}
-void __exit nfs_destroy_writepagecache(void)
+void nfs_destroy_writepagecache(void)
{
mempool_destroy(nfs_commit_mempool);
mempool_destroy(nfs_wdata_mempool);
_
Patches currently in -mm which might be from david-b@xxxxxxxxxxx are
origin.patch
fix-static-linking-of-nfs.patch
git-pcmcia.patch
ehci-fix-bogus-alteration-of-a-local-variable.patch
fix-broken-dubious-driver-suspend-methods.patch
pm-define-pm_event_prethaw.patch
pm-pci-and-ide-handle-pm_event_prethaw.patch
pm-video-drivers-and-pm_event_prethaw.patch
pm-usb-hcds-use-pm_event_prethaw.patch
pm-issue-pm_event_prethaw.patch
rtc-add-rtc-rs5c348-driver.patch
rtc-add-rtc-rs5c348-driver-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
