diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 16:06:31 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-14 16:06:31 +0900 |
| commit | c488a4731abb53aa1bab9fccd8a7472083159bfd (patch) | |
| tree | db6d4a664a1e4b7685c1d2d79da63263f40adf7b /arch/sparc/mm/generic_32.c | |
| parent | 6d2ae89c36e2adab5cfa69fecb11290082817ac6 (diff) | |
| parent | bba958783b1b4cb0a9420f4e11082467132a334c (diff) | |
| download | linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.tar.gz linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.tar.bz2 linux-c488a4731abb53aa1bab9fccd8a7472083159bfd.zip | |
Merge branch 'common/mmcif' into rmobile-latest
Diffstat (limited to 'arch/sparc/mm/generic_32.c')
| -rw-r--r-- | arch/sparc/mm/generic_32.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/mm/generic_32.c b/arch/sparc/mm/generic_32.c index 5edcac184eaf..e6067b75f11c 100644 --- a/arch/sparc/mm/generic_32.c +++ b/arch/sparc/mm/generic_32.c @@ -50,7 +50,7 @@ static inline int io_remap_pmd_range(struct mm_struct *mm, pmd_t * pmd, unsigned end = PGDIR_SIZE; offset -= address; do { - pte_t * pte = pte_alloc_map(mm, pmd, address); + pte_t *pte = pte_alloc_map(mm, NULL, pmd, address); if (!pte) return -ENOMEM; io_remap_pte_range(mm, pte, address, end - address, address + offset, prot, space); |