Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 694593e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 21209b61 e07a4b92

fs/proc/page.c

+1 −1
Original line number Diff line number Diff line
@@ -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) |