diff options
author | Felix Fietkau <nbd@openwrt.org> | 2012-06-16 21:06:33 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2012-06-16 21:06:33 +0000 |
commit | 50958f5e03071cab154344d0f2e3c03c12bc250e (patch) | |
tree | 6818a2dfbef3f2e9180ca3d48f06f66721b176b2 /target/linux/brcm47xx/patches-3.3 | |
parent | a5e2890ecbd5953370e37e131ac3da6b64c532b0 (diff) | |
download | master-31e0f0ae-50958f5e03071cab154344d0f2e3c03c12bc250e.tar.gz master-31e0f0ae-50958f5e03071cab154344d0f2e3c03c12bc250e.tar.bz2 master-31e0f0ae-50958f5e03071cab154344d0f2e3c03c12bc250e.zip |
kernel: replace the brcm47xx fuse workaround patches with a generic patch that applies to all mips targets
The dcache bug that it works around is a generic issue, not a brcm47xx cache quirk
SVN-Revision: 32395
Diffstat (limited to 'target/linux/brcm47xx/patches-3.3')
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/301-kmod-fuse-dcache-bug-r4k.patch | 28 | ||||
-rw-r--r-- | target/linux/brcm47xx/patches-3.3/302-kmod-fuse-dcache-bug-fuse.patch | 46 |
2 files changed, 0 insertions, 74 deletions
diff --git a/target/linux/brcm47xx/patches-3.3/301-kmod-fuse-dcache-bug-r4k.patch b/target/linux/brcm47xx/patches-3.3/301-kmod-fuse-dcache-bug-r4k.patch deleted file mode 100644 index 27cd2a7449..0000000000 --- a/target/linux/brcm47xx/patches-3.3/301-kmod-fuse-dcache-bug-r4k.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/arch/mips/mm/c-r4k.c -+++ b/arch/mips/mm/c-r4k.c -@@ -373,7 +373,7 @@ static inline void local_r4k___flush_cac - } - } - --static void r4k___flush_cache_all(void) -+void r4k___flush_cache_all(void) - { - r4k_on_each_cpu(local_r4k___flush_cache_all, NULL); - } -@@ -537,7 +537,7 @@ static inline void local_r4k_flush_cache - } - } - --static void r4k_flush_cache_page(struct vm_area_struct *vma, -+void r4k_flush_cache_page(struct vm_area_struct *vma, - unsigned long addr, unsigned long pfn) - { - struct flush_cache_page_args args; -@@ -1509,3 +1509,7 @@ void __cpuinit r4k_cache_init(void) - coherency_setup(); - #endif - } -+ -+/* fuse package DCACHE BUG patch exports */ -+void (*fuse_flush_cache_all)(void) = r4k___flush_cache_all; -+EXPORT_SYMBOL(fuse_flush_cache_all); diff --git a/target/linux/brcm47xx/patches-3.3/302-kmod-fuse-dcache-bug-fuse.patch b/target/linux/brcm47xx/patches-3.3/302-kmod-fuse-dcache-bug-fuse.patch deleted file mode 100644 index 20b7e47c02..0000000000 --- a/target/linux/brcm47xx/patches-3.3/302-kmod-fuse-dcache-bug-fuse.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- a/fs/fuse/dev.c -+++ b/fs/fuse/dev.c -@@ -651,11 +651,20 @@ static int fuse_copy_fill(struct fuse_co - return lock_request(cs->fc, cs->req); - } - -+#ifdef DCACHE_BUG -+extern void (*fuse_flush_cache_all)(void); -+#endif -+ - /* Do as much copy to/from userspace buffer as we can */ - static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size) - { - unsigned ncpy = min(*size, cs->len); - if (val) { -+#ifdef DCACHE_BUG -+ // patch from mailing list, it is very important, otherwise, -+ // can't mount, or ls mount point will hang -+ fuse_flush_cache_all(); -+#endif - if (cs->write) - memcpy(cs->buf, *val, ncpy); - else ---- a/fs/fuse/fuse_i.h -+++ b/fs/fuse/fuse_i.h -@@ -8,6 +8,7 @@ - - #ifndef _FS_FUSE_I_H - #define _FS_FUSE_I_H -+#define DCACHE_BUG - - #include <linux/fuse.h> - #include <linux/fs.h> ---- a/fs/fuse/inode.c -+++ b/fs/fuse/inode.c -@@ -1210,6 +1210,10 @@ static int __init fuse_init(void) - printk(KERN_INFO "fuse init (API version %i.%i)\n", - FUSE_KERNEL_VERSION, FUSE_KERNEL_MINOR_VERSION); - -+#ifdef DCACHE_BUG -+ printk("fuse init DCACHE_BUG workaround enabled\n"); -+#endif -+ - INIT_LIST_HEAD(&fuse_conn_list); - res = fuse_fs_init(); - if (res) |