git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
powerpc
/
mm
/
pgtable_32.c
diff --git
a/arch/powerpc/mm/pgtable_32.c
b/arch/powerpc/mm/pgtable_32.c
index
8fcacb0
..
d296eb6
100644
(file)
--- a/
arch/powerpc/mm/pgtable_32.c
+++ b/
arch/powerpc/mm/pgtable_32.c
@@
-20,6
+20,7
@@
*
*/
*
*/
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-371,7
+372,7
@@
void __init io_block_mapping(unsigned long virt, phys_addr_t phys,
* the PTE pointer is unmodified if PTE is not found.
*/
int
* the PTE pointer is unmodified if PTE is not found.
*/
int
-get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep
, pmd_t **pmdp
)
+get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep)
{
pgd_t *pgd;
pmd_t *pmd;
{
pgd_t *pgd;
pmd_t *pmd;
@@
-386,8
+387,6
@@
get_pteptr(struct mm_struct *mm, unsigned long addr, pte_t **ptep, pmd_t **pmdp)
if (pte) {
retval = 1;
*ptep = pte;
if (pte) {
retval = 1;
*ptep = pte;
- if (pmdp)
- *pmdp = pmd;
/* XXX caller needs to do pte_unmap, yuck */
}
}
/* XXX caller needs to do pte_unmap, yuck */
}
}
@@
-425,7
+424,7
@@
unsigned long iopa(unsigned long addr)
mm = &init_mm;
pa = 0;
mm = &init_mm;
pa = 0;
- if (get_pteptr(mm, addr, &pte
, NULL
)) {
+ if (get_pteptr(mm, addr, &pte)) {
pa = (pte_val(*pte) & PAGE_MASK) | (addr & ~PAGE_MASK);
pte_unmap(pte);
}
pa = (pte_val(*pte) & PAGE_MASK) | (addr & ~PAGE_MASK);
pte_unmap(pte);
}