git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sarah...
[pandora-kernel.git]
/
mm
/
mmap.c
diff --git
a/mm/mmap.c
b/mm/mmap.c
index
ac2631b
..
bbdc9af
100644
(file)
--- a/
mm/mmap.c
+++ b/
mm/mmap.c
@@
-960,7
+960,7
@@
unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
{
struct mm_struct * mm = current->mm;
struct inode *inode;
{
struct mm_struct * mm = current->mm;
struct inode *inode;
-
unsigned in
t vm_flags;
+
vm_flags_
t vm_flags;
int error;
unsigned long reqprot = prot;
int error;
unsigned long reqprot = prot;
@@
-1165,7
+1165,7
@@
SYSCALL_DEFINE1(old_mmap, struct mmap_arg_struct __user *, arg)
*/
int vma_wants_writenotify(struct vm_area_struct *vma)
{
*/
int vma_wants_writenotify(struct vm_area_struct *vma)
{
-
unsigned in
t vm_flags = vma->vm_flags;
+
vm_flags_
t vm_flags = vma->vm_flags;
/* If it was private or non-writable, the write bit is already clear */
if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
/* If it was private or non-writable, the write bit is already clear */
if ((vm_flags & (VM_WRITE|VM_SHARED)) != ((VM_WRITE|VM_SHARED)))
@@
-1193,7
+1193,7
@@
int vma_wants_writenotify(struct vm_area_struct *vma)
* We account for memory if it's a private writeable mapping,
* not hugepages and VM_NORESERVE wasn't set.
*/
* We account for memory if it's a private writeable mapping,
* not hugepages and VM_NORESERVE wasn't set.
*/
-static inline int accountable_mapping(struct file *file,
unsigned in
t vm_flags)
+static inline int accountable_mapping(struct file *file,
vm_flags_
t vm_flags)
{
/*
* hugetlb has its own accounting separate from the core VM
{
/*
* hugetlb has its own accounting separate from the core VM
@@
-1207,7
+1207,7
@@
static inline int accountable_mapping(struct file *file, unsigned int vm_flags)
unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, unsigned long flags,
unsigned long mmap_region(struct file *file, unsigned long addr,
unsigned long len, unsigned long flags,
-
unsigned in
t vm_flags, unsigned long pgoff)
+
vm_flags_
t vm_flags, unsigned long pgoff)
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma, *prev;
{
struct mm_struct *mm = current->mm;
struct vm_area_struct *vma, *prev;