diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-06 08:42:54 -0500 |
| commit | 0464ac9ebd90cfd5792d3c1158af848281b7eb09 (patch) | |
| tree | ab4419845b9e7ae3417741f34cfab6acd00754aa /mm/shmem.c | |
| parent | 0973a06cde8cc1522fbcf2baacb926f1ee3f4c79 (diff) | |
| parent | 9be260a646bf76fa418ee519afa10196b3164681 (diff) | |
Merge branch 'linus' into x86/mm
Conflicts:
arch/x86/mm/fault.c
Diffstat (limited to 'mm/shmem.c')
| -rw-r--r-- | mm/shmem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/shmem.c b/mm/shmem.c index 5d0de96c9789..19d566ccdeea 100644 --- a/mm/shmem.c +++ b/mm/shmem.c | |||
| @@ -2628,7 +2628,7 @@ struct file *shmem_file_setup(char *name, loff_t size, unsigned long flags) | |||
| 2628 | goto close_file; | 2628 | goto close_file; |
| 2629 | 2629 | ||
| 2630 | #ifdef CONFIG_SHMEM | 2630 | #ifdef CONFIG_SHMEM |
| 2631 | SHMEM_I(inode)->flags = flags & VM_ACCOUNT; | 2631 | SHMEM_I(inode)->flags = (flags & VM_NORESERVE) ? 0 : VM_ACCOUNT; |
| 2632 | #endif | 2632 | #endif |
| 2633 | d_instantiate(dentry, inode); | 2633 | d_instantiate(dentry, inode); |
| 2634 | inode->i_size = size; | 2634 | inode->i_size = size; |