[PATCH] misc fixes

- A C99 initialiser in drivers/char/mem.c

- Remove unneeded deref in madvise_willneed()

diff --git a/drivers/char/mem.c b/drivers/char/mem.c
index 99dfe07211220c8512b65f94762f60e1065a76fc..3df145966b6dfe3184244859ee674b2fa096676f 100644 (file)
--- a/drivers/char/mem.c
+++ b/drivers/char/mem.c
@@ -619,7 +619,7 @@ static ssize_t kmsg_write(struct file * file, const char * buf,
 }
 
 static struct file_operations kmsg_fops = {
-       write:          kmsg_write,
+       .write =        kmsg_write,
 };
 
 static int memory_open(struct inode * inode, struct file * filp)

diff --git a/mm/madvise.c b/mm/madvise.c
index 83a31a6ae11331f6b41d5e1f15f4023281beb334..200e2fa43ad9cf16ed18b49cce00d78fcc369698 100644 (file)
--- a/mm/madvise.c
+++ b/mm/madvise.c
@@ -57,7 +57,7 @@ static long madvise_willneed(struct vm_area_struct * vma,
 {
        struct file *file = vma->vm_file;
 
-       if (!vma->vm_file)
+       if (!file)
                return -EBADF;
 
        start = ((start - vma->vm_start) >> PAGE_SHIFT) + vma->vm_pgoff;