Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[profile/ivi/kernel-adaptation-intel-automotive.git] / mm / page_alloc.c

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ed85c02..bab8e3b 100644 (file)
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -4819,12 +4819,12 @@ void __init free_area_init_nodes(unsigned long *max_zone_pfn)
        for (i = 0; i < MAX_NR_ZONES; i++) {
                if (i == ZONE_MOVABLE)
                        continue;
-               printk("  %-8s ", zone_names[i]);
+               printk(KERN_CONT "  %-8s ", zone_names[i]);
                if (arch_zone_lowest_possible_pfn[i] ==
                                arch_zone_highest_possible_pfn[i])
-                       printk("empty\n");
+                       printk(KERN_CONT "empty\n");
                else
-                       printk("%0#10lx -> %0#10lx\n",
+                       printk(KERN_CONT "%0#10lx -> %0#10lx\n",
                                arch_zone_lowest_possible_pfn[i],
                                arch_zone_highest_possible_pfn[i]);
        }
@@ -5310,9 +5310,10 @@ void *__init alloc_large_system_hash(const char *tablename,
                                     int flags,
                                     unsigned int *_hash_shift,
                                     unsigned int *_hash_mask,
-                                    unsigned long limit)
+                                    unsigned long low_limit,
+                                    unsigned long high_limit)
 {
-       unsigned long long max = limit;
+       unsigned long long max = high_limit;
        unsigned long log2qty, size;
        void *table = NULL;
 
@@ -5350,6 +5351,8 @@ void *__init alloc_large_system_hash(const char *tablename,
        }
        max = min(max, 0x80000000ULL);
 
+       if (numentries < low_limit)
+               numentries = low_limit;
        if (numentries > max)
                numentries = max;