diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
| commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
| tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /arch/ia64/mm | |
| parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) | |
Merge with 2.3.99-pre6.
Diffstat (limited to 'arch/ia64/mm')
| -rw-r--r-- | arch/ia64/mm/fault.c | 2 | ||||
| -rw-r--r-- | arch/ia64/mm/init.c | 1 | ||||
| -rw-r--r-- | arch/ia64/mm/tlb.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 99cf5048c..02c4c5792 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c @@ -94,7 +94,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re * sure we exit gracefully rather than endlessly redo the * fault. */ - if (!handle_mm_fault(current, vma, address, (isr & IA64_ISR_W) != 0)) { + if (!handle_mm_fault(mm, vma, address, (isr & IA64_ISR_W) != 0)) { /* * We ran out of memory, or some other thing happened * to us that made us unable to handle the page fault diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index 3a630ca8c..b3047ce34 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c @@ -237,6 +237,7 @@ put_gate_page (struct page *page, unsigned long address) if (!PageReserved(page)) printk("put_gate_page: gate page at 0x%lx not in reserved memory\n", page_address(page)); + pgd = pgd_offset_k(address); /* note: this is NOT pgd_offset()! */ pmd = pmd_alloc(pgd, address); if (!pmd) { diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 568f7a347..acad4e200 100644 --- a/arch/ia64/mm/tlb.c +++ b/arch/ia64/mm/tlb.c @@ -138,7 +138,7 @@ flush_tlb_range (struct mm_struct *mm, unsigned long start, unsigned long end) */ ++nbits; if (((1UL << nbits) & SUPPORTED_PGBITS) == 0) - panic("flush_tlb_range: BUG: nbits=%lu\n", nbits); + panic("flush_tlb_range: BUG: nbits=%lu\n", nbits); } start &= ~((1UL << nbits) - 1); |