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 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
[pandora-kernel.git]
/
mm
/
shmem.c
diff --git
a/mm/shmem.c
b/mm/shmem.c
index
5d0de96
..
19d566c
100644
(file)
--- 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)
goto close_file;
#ifdef CONFIG_SHMEM
- SHMEM_I(inode)->flags =
flags &
VM_ACCOUNT;
+ SHMEM_I(inode)->flags =
(flags & VM_NORESERVE) ? 0 :
VM_ACCOUNT;
#endif
d_instantiate(dentry, inode);
inode->i_size = size;