diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 04:50:10 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-28 04:50:10 +0200 |
| commit | aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f (patch) | |
| tree | 57ca3e27227695acbd97408eabb0f967726c3b51 /mm/page_alloc.c | |
| parent | Merge /spare/repo/netdev-2.6/ branch 'ieee80211' (diff) | |
| parent | Merge upstream net/ieee80211.h changes into 'ieee80211' branch. (diff) | |
| download | linux-aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f.tar.xz linux-aa8f6dfd355021b4dd8b74b0588fd6fd8f21b79f.zip | |
Merge /spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7ee675ad101e..3c9f7f881125 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1667,9 +1667,8 @@ void __init memmap_init_zone(unsigned long size, int nid, unsigned long zone, #ifdef WANT_PAGE_VIRTUAL /* The shift won't overflow because ZONE_NORMAL is below 4G. */ if (!is_highmem_idx(zone)) - set_page_address(page, __va(start_pfn << PAGE_SHIFT)); + set_page_address(page, __va(pfn << PAGE_SHIFT)); #endif - start_pfn++; } } |