From 1ffbc7d0e02a82d899467b0730b7b0b0cf87726e Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 16 Nov 2012 14:15:00 -0800
Subject: [PATCH] --- yaml --- r: 335794 b: refs/heads/master c:
 498c2280212327858e521e9d21345d4cc2637f54 h: refs/heads/master v: v3

---
 [refs]             | 2 +-
 trunk/mm/highmem.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 36dc2c7fa552..ce5798c43c17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96710098ee124951ff2fed7cd8406da92aad011a
+refs/heads/master: 498c2280212327858e521e9d21345d4cc2637f54
diff --git a/trunk/mm/highmem.c b/trunk/mm/highmem.c
index d517cd16a6eb..2da13a5c50e2 100644
--- a/trunk/mm/highmem.c
+++ b/trunk/mm/highmem.c
@@ -98,7 +98,7 @@ struct page *kmap_to_page(void *vaddr)
 {
 	unsigned long addr = (unsigned long)vaddr;
 
-	if (addr >= PKMAP_ADDR(0) && addr <= PKMAP_ADDR(LAST_PKMAP)) {
+	if (addr >= PKMAP_ADDR(0) && addr < PKMAP_ADDR(LAST_PKMAP)) {
 		int i = (addr - PKMAP_ADDR(0)) >> PAGE_SHIFT;
 		return pte_page(pkmap_page_table[i]);
 	}