diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-04 02:29:19 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-04 02:29:19 +0100 |
| commit | 91d75e209bd59695f0708d66964d928d45b3b2f3 (patch) | |
| tree | 32cab1359d951e4193bebb181a0f0319824a2b95 /fs/proc/page.c | |
| parent | 9976b39b5031bbf76f715893cf080b6a17683881 (diff) | |
| parent | 8b0e5860cb099d7958d13b00ffbc35ad02735700 (diff) | |
Merge branch 'x86/core' into core/percpu
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) | |