diff options
| author | Bo Yan <byan@nvidia.com> | 2012-07-09 14:11:09 -0700 |
|---|---|---|
| committer | Bo Yan <byan@nvidia.com> | 2012-07-09 14:11:09 -0700 |
| commit | 5056dc8ccaa3cbafad5ae8eaeceec2994da3cfe5 (patch) | |
| tree | c3c9f44c314ff2b190eccdff13258bf5df078cc5 /mm | |
| parent | f092a6eca1da1086c4b4a2a6893b53d1997dc58d (diff) | |
| parent | e69322319507d5d3f916498fe326499d4f5d46b3 (diff) | |
Merge remote branch 'origin/android-tegra-nv-3.4' into tot
Conflicts:
arch/arm/mach-imx/hotplug.c
Change-Id: I33c5f2e4c2d556c09173be3c5fd36bf59f7c9ca8
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/swapfile.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/mm/swapfile.c b/mm/swapfile.c index fafc26d1b1dc..38186d96a72b 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c @@ -1924,24 +1924,20 @@ static unsigned long read_swap_header(struct swap_info_struct *p, /* * Find out how many pages are allowed for a single swap - * device. There are three limiting factors: 1) the number + * device. There are two limiting factors: 1) the number * of bits for the swap offset in the swp_entry_t type, and * 2) the number of bits in the swap pte as defined by the - * the different architectures, and 3) the number of free bits - * in an exceptional radix_tree entry. In order to find the + * different architectures. In order to find the * largest possible bit mask, a swap entry with swap type 0 * and swap offset ~0UL is created, encoded to a swap pte, * decoded to a swp_entry_t again, and finally the swap * offset is extracted. This will mask all the bits from * the initial ~0UL mask that can't be encoded in either * the swp_entry_t or the architecture definition of a - * swap pte. Then the same is done for a radix_tree entry. + * swap pte. */ maxpages = swp_offset(pte_to_swp_entry( - swp_entry_to_pte(swp_entry(0, ~0UL)))); - maxpages = swp_offset(radix_to_swp_entry( - swp_to_radix_entry(swp_entry(0, maxpages)))) + 1; - + swp_entry_to_pte(swp_entry(0, ~0UL)))) + 1; if (maxpages > swap_header->info.last_page) { maxpages = swap_header->info.last_page + 1; /* p->max is an unsigned int: don't overflow it */ |