git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
uv
/
uv_hub.h
diff --git
a/arch/x86/include/asm/uv/uv_hub.h
b/arch/x86/include/asm/uv/uv_hub.h
index
40be813
..
bf6b88e
100644
(file)
--- a/
arch/x86/include/asm/uv/uv_hub.h
+++ b/
arch/x86/include/asm/uv/uv_hub.h
@@
-307,7
+307,7
@@
static inline unsigned long uv_read_global_mmr32(int pnode, unsigned long offset
* Access Global MMR space using the MMR space located at the top of physical
* memory.
*/
* Access Global MMR space using the MMR space located at the top of physical
* memory.
*/
-static inline
unsigned long
*uv_global_mmr64_address(int pnode, unsigned long offset)
+static inline
volatile void __iomem
*uv_global_mmr64_address(int pnode, unsigned long offset)
{
return __va(UV_GLOBAL_MMR64_BASE |
UV_GLOBAL_MMR64_PNODE_BITS(pnode) | offset);
{
return __va(UV_GLOBAL_MMR64_BASE |
UV_GLOBAL_MMR64_PNODE_BITS(pnode) | offset);
@@
-329,7
+329,8
@@
static inline unsigned long uv_read_global_mmr64(int pnode, unsigned long offset
*/
static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset)
{
*/
static inline unsigned long uv_global_gru_mmr_address(int pnode, unsigned long offset)
{
- return UV_GLOBAL_GRU_MMR_BASE | offset | (pnode << uv_hub_info->m_val);
+ return UV_GLOBAL_GRU_MMR_BASE | offset |
+ ((unsigned long)pnode << uv_hub_info->m_val);
}
static inline void uv_write_global_mmr8(int pnode, unsigned long offset, unsigned char val)
}
static inline void uv_write_global_mmr8(int pnode, unsigned long offset, unsigned char val)