diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-29 05:27:07 +0000 |
| commit | a60c6812feb6ba35b5b8a9ee8a5ca3d01d1fcd5f (patch) | |
| tree | 2290ff15f280314a063f3dfc523742c8934c4259 /mm | |
| parent | 1a1d77dd589de5a567fa95e36aa6999c704ceca4 (diff) | |
Merge with Linux 2.4.0-test8-pre1.
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/bootmem.c | 2 | ||||
| -rw-r--r-- | mm/filemap.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index fbcb2bb06..0a8d37ba2 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -205,7 +205,7 @@ found: bdata->last_pos = start+areasize-1; bdata->last_offset = remaining_size; } - bdata->last_offset &= ~PAGE_MASK; + bdata->last_offset &= ~PAGE_MASK; } else { bdata->last_pos = start + areasize - 1; bdata->last_offset = size & ~PAGE_MASK; diff --git a/mm/filemap.c b/mm/filemap.c index 107f9d8a9..977225432 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -895,7 +895,7 @@ static void generic_file_readahead(int reada_ok, * page only. */ if (PageLocked(page)) { - if (!filp->f_ralen || index >= raend || index + filp->f_ralen < raend) { + if (!filp->f_ralen || index >= raend || index + filp->f_rawin < raend) { raend = index; if (raend < end_index) max_ahead = filp->f_ramax; @@ -1072,6 +1072,7 @@ found_page: if (!Page_Uptodate(page)) goto page_not_up_to_date; + generic_file_readahead(reada_ok, filp, inode, page); page_ok: /* * Ok, we have the page, and it's up-to-date, so |