projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hrtimer: Update active_bases before calling hrtimer_force_reprogram()
[firefly-linux-kernel-4.4.55.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index cf2d0ca010bc52efd5ea86c7f6ba760a5c3ef286..1ea2400b52450fccdc526d569d1447657379609d 100644
(file)
--- a/
mm/shmem.c
+++ b/
mm/shmem.c
@@
-31,7
+31,7
@@
#include <linux/mm.h>
#include <linux/export.h>
#include <linux/swap.h>
#include <linux/mm.h>
#include <linux/export.h>
#include <linux/swap.h>
-#include <linux/
a
io.h>
+#include <linux/
u
io.h>
static struct vfsmount *shm_mnt;
static struct vfsmount *shm_mnt;
@@
-3118,8
+3118,6
@@
static const struct file_operations shmem_file_operations = {
.mmap = shmem_mmap,
#ifdef CONFIG_TMPFS
.llseek = shmem_file_llseek,
.mmap = shmem_mmap,
#ifdef CONFIG_TMPFS
.llseek = shmem_file_llseek,
- .read = new_sync_read,
- .write = new_sync_write,
.read_iter = shmem_file_read_iter,
.write_iter = generic_file_write_iter,
.fsync = noop_fsync,
.read_iter = shmem_file_read_iter,
.write_iter = generic_file_write_iter,
.fsync = noop_fsync,