diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-10-05 01:18:40 +0000 |
| commit | 012bb3e61e5eced6c610f9e036372bf0c8def2d1 (patch) | |
| tree | 87efc733f9b164e8c85c0336f92c8fb7eff6d183 /kernel/ptrace.c | |
| parent | 625a1589d3d6464b5d90b8a0918789e3afffd220 (diff) | |
Merge with Linux 2.4.0-test9. Please check DECstation, I had a number
of rejects to fixup while integrating Linus patches. I also found
that this kernel will only boot SMP on Origin; the UP kernel freeze
soon after bootup with SCSI timeout messages. I commit this anyway
since I found that the last CVS versions had the same problem.
Diffstat (limited to 'kernel/ptrace.c')
| -rw-r--r-- | kernel/ptrace.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/kernel/ptrace.c b/kernel/ptrace.c index a749bb501..87dea8254 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -44,8 +44,12 @@ repeat: if (write && (!pte_write(*pgtable) || !pte_dirty(*pgtable))) goto fault_in_page; page = pte_page(*pgtable); - if ((!VALID_PAGE(page)) || PageReserved(page)) - return 0; + + /* ZERO_PAGE is special: reads from it are ok even though it's marked reserved */ + if (page != ZERO_PAGE(addr) || write) { + if ((!VALID_PAGE(page)) || PageReserved(page)) + return 0; + } flush_cache_page(vma, addr); if (write) { |