diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 23:49:39 +0200 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-07-19 23:49:39 +0200 |
| commit | 39299d9d15c41cbdd7c7009967cd35afaf34d8fa (patch) | |
| tree | 42a0c0408fcf76024eb6885a27d4f1ed0228abcf /arch/ppc64/mm/init.c | |
| parent | AUDIT: Reduce contention in audit_serial() (diff) | |
| parent | Merge master.kernel.org:/home/rmk/linux-2.6-serial (diff) | |
| download | linux-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.tar.xz linux-39299d9d15c41cbdd7c7009967cd35afaf34d8fa.zip | |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'arch/ppc64/mm/init.c')
| -rw-r--r-- | arch/ppc64/mm/init.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index b50b3a446dbe..e58a24d42879 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c @@ -180,9 +180,10 @@ static int map_io_page(unsigned long ea, unsigned long pa, int flags) hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP); /* Panic if a pte grpup is full */ - if (ppc_md.hpte_insert(hpteg, va, pa >> PAGE_SHIFT, 0, - _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX, - 1, 0) == -1) { + if (ppc_md.hpte_insert(hpteg, va, pa >> PAGE_SHIFT, + HPTE_V_BOLTED, + _PAGE_NO_CACHE|_PAGE_GUARDED|PP_RWXX) + == -1) { panic("map_io_page: could not insert mapping"); } } |