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/arm | |
| parent | 2e837819b1563679b55363d469239fdf4f17fbbb (diff) | |
Merge with Linu 2.4.0-test6-pre6.
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/small_page.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/small_page.c b/arch/arm/mm/small_page.c index ee7f571a7..40c91ba32 100644 --- a/arch/arm/mm/small_page.c +++ b/arch/arm/mm/small_page.c @@ -116,7 +116,7 @@ again: remove_page_from_queue(page); restore_flags(flags); - return page_address(page) + (offset << order->shift); + return (unsigned long) page_address(page) + (offset << order->shift); need_new_page: page = alloc_page(priority); |