diff options
author | Jes Sorensen <jes@sgi.com> | 2006-10-25 05:49:53 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2006-10-26 17:57:06 -0400 |
commit | f2454a1a4b2aca38d3b7887619f43291d773c1ee (patch) | |
tree | 72b865056b807feef4f85a6c2fa48e24eed38cd0 | |
parent | e80391500078b524083ba51c3df01bbaaecc94bb (diff) |
[IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access
Don't PAGE_SHIFT pointer before handing it to virt_to_page() in
xlate_dev_kmem_ptr() as it results in a double shift.
Spotted by Bob Montgomery.
Signed-off-by: Jes Sorensen <jes@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r-- | include/asm-ia64/uaccess.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h index 9adb51211c22..449c8c0fa2bd 100644 --- a/include/asm-ia64/uaccess.h +++ b/include/asm-ia64/uaccess.h | |||
@@ -389,7 +389,7 @@ xlate_dev_kmem_ptr (char * p) | |||
389 | struct page *page; | 389 | struct page *page; |
390 | char * ptr; | 390 | char * ptr; |
391 | 391 | ||
392 | page = virt_to_page((unsigned long)p >> PAGE_SHIFT); | 392 | page = virt_to_page((unsigned long)p); |
393 | if (PageUncached(page)) | 393 | if (PageUncached(page)) |
394 | ptr = (char *)__pa(p) + __IA64_UNCACHED_OFFSET; | 394 | ptr = (char *)__pa(p) + __IA64_UNCACHED_OFFSET; |
395 | else | 395 | else |