diff options
| author | Colin Cross <ccross@android.com> | 2012-03-02 12:34:55 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2012-03-02 12:34:55 -0800 |
| commit | a5d2e61148fba0f09499c4b65902adebc391350b (patch) | |
| tree | 4d21ec2e79479d54d2a1a22bade9c3f0438c5624 /mm/page_alloc.c | |
| parent | fbd94b86e411e6ea0b4fa56682120b32af5c16c2 (diff) | |
| parent | 6b21d18ed50c7d145220b0724ea7f2613abf0f95 (diff) | |
Merge commit 'v3.3-rc5' into android-3.3
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 7b5c9346dc98..3449c1bbe604 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5237,6 +5237,7 @@ void *__init alloc_large_system_hash(const char *tablename, max = ((unsigned long long)nr_all_pages << PAGE_SHIFT) >> 4; do_div(max, bucketsize); } + max = min(max, 0x80000000ULL); if (numentries > max) numentries = max; |