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 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
pgtsrmmu.h
diff --git
a/arch/sparc/include/asm/pgtsrmmu.h
b/arch/sparc/include/asm/pgtsrmmu.h
index
1407c07
..
f6ae2b2
100644
(file)
--- a/
arch/sparc/include/asm/pgtsrmmu.h
+++ b/
arch/sparc/include/asm/pgtsrmmu.h
@@
-280,7
+280,7
@@
static inline unsigned long srmmu_hwprobe(unsigned long vaddr)
return retval;
}
#else
-#define srmmu_hwprobe(addr)
(srmmu_swprobe(addr, 0) & SRMMU_PTE_PMASK
)
+#define srmmu_hwprobe(addr)
srmmu_swprobe(addr, 0
)
#endif
static inline int