diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:22:13 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 13:22:13 +0100 |
| commit | 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d (patch) | |
| tree | c7f148cdae7a6cf4013253c6c2dbd1c49e837e32 /fs/proc/page.c | |
| parent | 2b8f836fb196acede88b6cc772e9057e0a9c0223 (diff) | |
| parent | 694593e3374a67d95ece6a275a1f181644c2c4d8 (diff) | |
| download | talos-op-linux-4434e5156409eb3ec98f5ad7f0a0c07ebafe970d.tar.gz talos-op-linux-4434e5156409eb3ec98f5ad7f0a0c07ebafe970d.zip | |
Merge branches 'sched/cleanups', 'sched/urgent' and 'linus' into sched/core
Diffstat (limited to 'fs/proc/page.c')
| -rw-r--r-- | fs/proc/page.c | 2 |
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) | |
