projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
fs
/
proc
/
task_nommu.c
diff --git
a/fs/proc/task_nommu.c
b/fs/proc/task_nommu.c
index 370be0a2c9098ea411ed98bd49d2de929392f32f..863464d5519c935df03a510f9ab03f7e731f14e9 100644
(file)
--- a/
fs/proc/task_nommu.c
+++ b/
fs/proc/task_nommu.c
@@
-2,6
+2,7
@@
#include <linux/mm.h>
#include <linux/file.h>
#include <linux/fdtable.h>
#include <linux/mm.h>
#include <linux/file.h>
#include <linux/fdtable.h>
+#include <linux/fs_struct.h>
#include <linux/mount.h>
#include <linux/ptrace.h>
#include <linux/seq_file.h>
#include <linux/mount.h>
#include <linux/ptrace.h>
#include <linux/seq_file.h>
@@
-49,7
+50,7
@@
void task_mem(struct seq_file *m, struct mm_struct *mm)
else
bytes += kobjsize(mm);
else
bytes += kobjsize(mm);
- if (current->fs &&
atomic_read(¤t->fs->count)
> 1)
+ if (current->fs &&
current->fs->users
> 1)
sbytes += kobjsize(current->fs);
else
bytes += kobjsize(current->fs);
sbytes += kobjsize(current->fs);
else
bytes += kobjsize(current->fs);