Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 361310
b: refs/heads/master
c: a2362d2
h: refs/heads/master
v: v3
  • Loading branch information
Michel Lespinasse authored and Linus Torvalds committed Mar 15, 2013
1 parent c7730f6 commit c73810f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f4846e52c51755fe1dd6642a117bc23cd0655c95
refs/heads/master: a2362d24764a4e9a3187fc46b14e1d2cd0657700
5 changes: 2 additions & 3 deletions trunk/mm/fremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
struct vm_area_struct *vma;
int err = -EINVAL;
int has_write_lock = 0;
vm_flags_t vm_flags;
vm_flags_t vm_flags = 0;

if (prot)
return err;
Expand Down Expand Up @@ -163,8 +163,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size,
* and that the remapped range is valid and fully within
* the single existing vma.
*/
vm_flags = vma->vm_flags;
if (!vma || !(vm_flags & VM_SHARED))
if (!vma || !(vma->vm_flags & VM_SHARED))
goto out;

if (!vma->vm_ops || !vma->vm_ops->remap_pages)
Expand Down

0 comments on commit c73810f

Please sign in to comment.