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 14:57:06 -0700 |
| commit | f2454a1a4b2aca38d3b7887619f43291d773c1ee (patch) | |
| tree | 72b865056b807feef4f85a6c2fa48e24eed38cd0 /include/asm-ia64 | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff) | |
| download | linux-dev-f2454a1a4b2aca38d3b7887619f43291d773c1ee.tar.xz linux-dev-f2454a1a4b2aca38d3b7887619f43291d773c1ee.zip | |
[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>
Diffstat (limited to 'include/asm-ia64')
| -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) struct page *page; char * ptr; - page = virt_to_page((unsigned long)p >> PAGE_SHIFT); + page = virt_to_page((unsigned long)p); if (PageUncached(page)) ptr = (char *)__pa(p) + __IA64_UNCACHED_OFFSET; else |