summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-25 02:42:08 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-25 02:42:08 +0300
commit694593e3374a67d95ece6a275a1f181644c2c4d8 (patch)
treedf083065019ded7607e460a7bea44f53deb505f8 /fs
parent21209b61b0ca0aafb04b5ab3561e3c8e7c7f776d (diff)
parente07a4b9217d1e97d2f3a62b6b070efdc61212110 (diff)
downloadlinux-694593e3374a67d95ece6a275a1f181644c2c4d8.tar.xz
Merge branch 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc
* 'proc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: proc: fix PG_locked reporting in /proc/kpageflags
Diffstat (limited to 'fs')
-rw-r--r--fs/proc/page.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/page.c b/fs/proc/page.c
index 767d95a6d1b1..2d1345112a42 100644
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -107,7 +107,7 @@ static ssize_t kpageflags_read(struct file *file, char __user *buf,
else
kflags = ppage->flags;
- uflags = kpf_copy_bit(KPF_LOCKED, PG_locked, kflags) |
+ uflags = kpf_copy_bit(kflags, KPF_LOCKED, PG_locked) |
kpf_copy_bit(kflags, KPF_ERROR, PG_error) |
kpf_copy_bit(kflags, KPF_REFERENCED, PG_referenced) |
kpf_copy_bit(kflags, KPF_UPTODATE, PG_uptodate) |