diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2011-05-26 06:16:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-26 12:20:31 -0400 |
commit | ca16d140af91febe25daeb9e032bf8bd46b8c31f (patch) | |
tree | a093c3f244a1bdfc2a50e271a7e6df3324df0f05 /mm/mlock.c | |
parent | 4db70f73e56961b9bcdfd0c36c62847a18b7dbb5 (diff) |
mm: don't access vm_flags as 'int'
The type of vma->vm_flags is 'unsigned long'. Neither 'int' nor
'unsigned int'. This patch fixes such misuse.
Signed-off-by: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
[ Changed to use a typedef - we'll extend it to cover more cases
later, since there has been discussion about making it a 64-bit
type.. - Linus ]
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/mlock.c')
-rw-r--r-- | mm/mlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mm/mlock.c b/mm/mlock.c index 516b2c2ddd5a..048260c4e02e 100644 --- a/mm/mlock.c +++ b/mm/mlock.c | |||
@@ -307,13 +307,13 @@ void munlock_vma_pages_range(struct vm_area_struct *vma, | |||
307 | * For vmas that pass the filters, merge/split as appropriate. | 307 | * For vmas that pass the filters, merge/split as appropriate. |
308 | */ | 308 | */ |
309 | static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev, | 309 | static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev, |
310 | unsigned long start, unsigned long end, unsigned int newflags) | 310 | unsigned long start, unsigned long end, vm_flags_t newflags) |
311 | { | 311 | { |
312 | struct mm_struct *mm = vma->vm_mm; | 312 | struct mm_struct *mm = vma->vm_mm; |
313 | pgoff_t pgoff; | 313 | pgoff_t pgoff; |
314 | int nr_pages; | 314 | int nr_pages; |
315 | int ret = 0; | 315 | int ret = 0; |
316 | int lock = newflags & VM_LOCKED; | 316 | int lock = !!(newflags & VM_LOCKED); |
317 | 317 | ||
318 | if (newflags == vma->vm_flags || (vma->vm_flags & VM_SPECIAL) || | 318 | if (newflags == vma->vm_flags || (vma->vm_flags & VM_SPECIAL) || |
319 | is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm)) | 319 | is_vm_hugetlb_page(vma) || vma == get_gate_vma(current->mm)) |
@@ -385,7 +385,7 @@ static int do_mlock(unsigned long start, size_t len, int on) | |||
385 | prev = vma; | 385 | prev = vma; |
386 | 386 | ||
387 | for (nstart = start ; ; ) { | 387 | for (nstart = start ; ; ) { |
388 | unsigned int newflags; | 388 | vm_flags_t newflags; |
389 | 389 | ||
390 | /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ | 390 | /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ |
391 | 391 | ||
@@ -524,7 +524,7 @@ static int do_mlockall(int flags) | |||
524 | goto out; | 524 | goto out; |
525 | 525 | ||
526 | for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { | 526 | for (vma = current->mm->mmap; vma ; vma = prev->vm_next) { |
527 | unsigned int newflags; | 527 | vm_flags_t newflags; |
528 | 528 | ||
529 | newflags = vma->vm_flags | VM_LOCKED; | 529 | newflags = vma->vm_flags | VM_LOCKED; |
530 | if (!(flags & MCL_CURRENT)) | 530 | if (!(flags & MCL_CURRENT)) |