1513b39a8c
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
32 lines
953 B
Diff
32 lines
953 B
Diff
--- a/arch/mips/mm/cache.c
|
|
+++ b/arch/mips/mm/cache.c
|
|
@@ -38,6 +38,7 @@ void (*__flush_cache_vunmap)(void);
|
|
|
|
void (*__flush_kernel_vmap_range)(unsigned long vaddr, int size);
|
|
EXPORT_SYMBOL_GPL(__flush_kernel_vmap_range);
|
|
+EXPORT_SYMBOL(__flush_cache_all);
|
|
void (*__invalidate_kernel_vmap_range)(unsigned long vaddr, int size);
|
|
|
|
/* MIPS specific cache operations */
|
|
--- a/fs/fuse/dev.c
|
|
+++ b/fs/fuse/dev.c
|
|
@@ -20,6 +20,9 @@
|
|
#include <linux/swap.h>
|
|
#include <linux/splice.h>
|
|
#include <linux/aio.h>
|
|
+#ifdef CONFIG_MIPS
|
|
+#include <asm/cacheflush.h>
|
|
+#endif
|
|
|
|
MODULE_ALIAS_MISCDEV(FUSE_MINOR);
|
|
MODULE_ALIAS("devname:fuse");
|
|
@@ -749,6 +752,9 @@ static int fuse_copy_fill(struct fuse_co
|
|
static int fuse_copy_do(struct fuse_copy_state *cs, void **val, unsigned *size)
|
|
{
|
|
unsigned ncpy = min(*size, cs->len);
|
|
+#ifdef CONFIG_MIPS
|
|
+ __flush_cache_all();
|
|
+#endif
|
|
if (val) {
|
|
void *pgaddr = kmap_atomic(cs->pg);
|
|
void *buf = pgaddr + cs->offset;
|