summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 17:03:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-31 17:03:50 -0800
commitd5b9b787b5e1618dfe82a2c2a6972374e85b02db (patch)
tree42fa7b4e4381e40fc94ae41fd932f9b7b1abece6 /include
parent16b7b2ac0148e839da86af8747b6fa4aad43a9b7 (diff)
parent024e4f2c5175a482c234cf67ed22368d770bf78f (diff)
Merge branch 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Correct definition of handle_IPI [IA64] move SAL_CACHE_FLUSH check later in boot [IA64] MCA recovery: Montecito support [IA64] cpu-hotplug: Fixing confliction between CPU hot-add and IPI [IA64] don't double >> PAGE_SHIFT pointer for /dev/kmem access
Diffstat (limited to 'include')
-rw-r--r--include/asm-ia64/sal.h1
-rw-r--r--include/asm-ia64/uaccess.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index 0b210abbe00..d000689d914 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -659,6 +659,7 @@ ia64_sal_freq_base (unsigned long which, unsigned long *ticks_per_second,
}
extern s64 ia64_sal_cache_flush (u64 cache_type);
+extern void __init check_sal_cache_flush (void);
/* Initialize all the processor and platform level instruction and data caches */
static inline s64
diff --git a/include/asm-ia64/uaccess.h b/include/asm-ia64/uaccess.h
index 9adb51211c2..449c8c0fa2b 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