From 9288ad7c5a36d2c7a37581f68e9f86aa7d206d66 Mon Sep 17 00:00:00 2001
From: Hans Rosenfeld <hans.rosenfeld@amd.com>
Date: Sat, 23 Feb 2008 15:23:31 -0800
Subject: [PATCH] --- yaml --- r: 86208 b: refs/heads/master c:
 745329c4a2a25efbf5ba6cd7842e07840e4e9775 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/fs/proc/task_mmu.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ece2896d2208..078d5b3de863 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8936b6dba234c994dc4c168818376197abc2faac
+refs/heads/master: 745329c4a2a25efbf5ba6cd7842e07840e4e9775
diff --git a/trunk/fs/proc/task_mmu.c b/trunk/fs/proc/task_mmu.c
index 49958cffbd8d..6dc0334815f7 100644
--- a/trunk/fs/proc/task_mmu.c
+++ b/trunk/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