aboutsummaryrefslogtreecommitdiffstats
path: root/mm/page_alloc.c
diff options
context:
space:
mode:
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r--mm/page_alloc.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 918330f71dba..b7af568f0ed9 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5242,9 +5242,10 @@ void *__init alloc_large_system_hash(const char *tablename,
5242 int flags, 5242 int flags,
5243 unsigned int *_hash_shift, 5243 unsigned int *_hash_shift,
5244 unsigned int *_hash_mask, 5244 unsigned int *_hash_mask,
5245 unsigned long limit) 5245 unsigned long low_limit,
5246 unsigned long high_limit)
5246{ 5247{
5247 unsigned long long max = limit; 5248 unsigned long long max = high_limit;
5248 unsigned long log2qty, size; 5249 unsigned long log2qty, size;
5249 void *table = NULL; 5250 void *table = NULL;
5250 5251
@@ -5282,6 +5283,8 @@ void *__init alloc_large_system_hash(const char *tablename,
5282 } 5283 }
5283 max = min(max, 0x80000000ULL); 5284 max = min(max, 0x80000000ULL);
5284 5285
5286 if (numentries < low_limit)
5287 numentries = low_limit;
5285 if (numentries > max) 5288 if (numentries > max)
5286 numentries = max; 5289 numentries = max;
5287 5290