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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
mm
/
hash_utils_64.c
diff --git
a/arch/powerpc/mm/hash_utils_64.c
b/arch/powerpc/mm/hash_utils_64.c
index
83f534d
..
5e95844
100644
(file)
--- a/
arch/powerpc/mm/hash_utils_64.c
+++ b/
arch/powerpc/mm/hash_utils_64.c
@@
-1123,7
+1123,7
@@
void hash_preload(struct mm_struct *mm, unsigned long ea,
else
#endif /* CONFIG_PPC_HAS_HASH_64K */
rc = __hash_page_4K(ea, access, vsid, ptep, trap, local, ssize,
else
#endif /* CONFIG_PPC_HAS_HASH_64K */
rc = __hash_page_4K(ea, access, vsid, ptep, trap, local, ssize,
- subpage_protection(
pgdir
, ea));
+ subpage_protection(
mm
, ea));
/* Dump some info in case of hash insertion failure, they should
* never happen so it is really useful to know if/when they do
/* Dump some info in case of hash insertion failure, they should
* never happen so it is really useful to know if/when they do