diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:38 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-29 14:23:38 -0800 |
| commit | 2f12c74f0cfdc93e1d47ac70766e837ef29472fd (patch) | |
| tree | 92e5c54b3f82254922f7f2ed6395e93d589356f5 | |
| parent | 92af254a1b7ea8c09ddff83887e5edc1342b37f8 (diff) | |
| parent | cab3f16febeaf1a60e38159ff578f609f9976544 (diff) | |
| download | blackbird-op-linux-2f12c74f0cfdc93e1d47ac70766e837ef29472fd.tar.gz blackbird-op-linux-2f12c74f0cfdc93e1d47ac70766e837ef29472fd.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
| -rw-r--r-- | arch/sparc64/mm/generic.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/mm/generic.c b/arch/sparc64/mm/generic.c index d9396c1721cd..580b63da836b 100644 --- a/arch/sparc64/mm/generic.c +++ b/arch/sparc64/mm/generic.c @@ -77,6 +77,7 @@ static inline void io_remap_pte_range(struct mm_struct *mm, pte_t * pte, BUG_ON(!pte_none(*pte)); set_pte_at(mm, address, pte, entry); address += PAGE_SIZE; + pte_val(entry) += PAGE_SIZE; pte++; } while (address < curend); } while (address < end); |
