diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-08-08 19:25:53 +0000 |
| commit | 57445428488a2862840c4d7c96d7746c11031aaf (patch) | |
| tree | 60b88b3a21896a33ee4dccc727d88b745a9ff731 /arch/m68k | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/atari/stram.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index 7406a8d02..2b804b767 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c @@ -934,7 +934,7 @@ static int unswap_by_read(unsigned short *map, unsigned long max, get a clean page and read the swap into it. */ page_map = read_swap_cache(entry); if (page_map) { - page = page_address(page_map); + page = (unsigned long) page_address(page_map); read_lock(&tasklist_lock); for_each_task(p) unswap_process(p->mm, entry, page |