The patch titled /proc/pid/pagemap: fix PM_SPECIAL macro has been added to the -mm tree. Its filename is proc-pid-pagemap-fix-pm_special-macro.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: /proc/pid/pagemap: fix PM_SPECIAL macro From: "Hans Rosenfeld" <hans.rosenfeld@xxxxxxx> There seems to be a bug in the PM_SPECIAL macro for /proc/pid/pagemap. I think masking out those other bits makes more sense then setting all those mask bits. Signed-off-by: Hans Rosenfeld <Hans.Rosenfeld@xxxxxxx> Cc: Matt Mackall <mpm@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/proc/task_mmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/proc/task_mmu.c~proc-pid-pagemap-fix-pm_special-macro fs/proc/task_mmu.c --- a/fs/proc/task_mmu.c~proc-pid-pagemap-fix-pm_special-macro +++ a/fs/proc/task_mmu.c @@ -531,7 +531,7 @@ struct pagemapread { #define PM_RESERVED_BITS 3 #define PM_RESERVED_OFFSET (64 - PM_RESERVED_BITS) #define PM_RESERVED_MASK (((1LL<<PM_RESERVED_BITS)-1) << PM_RESERVED_OFFSET) -#define PM_SPECIAL(nr) (((nr) << PM_RESERVED_OFFSET) | PM_RESERVED_MASK) +#define PM_SPECIAL(nr) (((nr) << PM_RESERVED_OFFSET) & PM_RESERVED_MASK) #define PM_NOT_PRESENT PM_SPECIAL(1LL) #define PM_SWAP PM_SPECIAL(2LL) #define PM_END_OF_BUFFER 1 _ Patches currently in -mm which might be from hans.rosenfeld@xxxxxxx are proc-pid-pagemap-fix-pm_special-macro.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html