hugetlbfs: fix changes to command line processing

Previously, a check for hugepages_supported was added before processing
hugetlb command line parameters.  On some architectures such as powerpc,
hugepages_supported() is not set to true until after command line
processing.  Therefore, no hugetlb command line parameters would be
accepted.

Remove the additional checks for hugepages_supported.  In hugetlb_init,
print a warning if !hugepages_supported and command line parameters were
specified.

Reported-by: Sandipan Das <sandipan.osd@gmail.com>
Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Link: http://lkml.kernel.org/r/b1f04f9f-fa46-c2a0-7693-4a0679d2a1ee@oracle.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 7860045..8852b0b 100644 (file)
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -3212,8 +3212,11 @@ static int __init hugetlb_init(void)
 {
        int i;
 
-       if (!hugepages_supported())
+       if (!hugepages_supported()) {
+               if (hugetlb_max_hstate || default_hstate_max_huge_pages)
+                       pr_warn("HugeTLB: huge pages not supported, ignoring associated command-line parameters\n");
                return 0;
+       }
 
        /*
         * Make sure HPAGE_SIZE (HUGETLB_PAGE_ORDER) hstate exists.  Some
@@ -3315,11 +3318,6 @@ static int __init hugepages_setup(char *s)
        unsigned long *mhp;
        static unsigned long *last_mhp;
 
-       if (!hugepages_supported()) {
-               pr_warn("HugeTLB: huge pages not supported, ignoring hugepages = %s\n", s);
-               return 0;
-       }
-
        if (!parsed_valid_hugepagesz) {
                pr_warn("HugeTLB: hugepages=%s does not follow a valid hugepagesz, ignoring\n", s);
                parsed_valid_hugepagesz = true;
@@ -3372,11 +3370,6 @@ static int __init hugepagesz_setup(char *s)
        struct hstate *h;
 
        parsed_valid_hugepagesz = false;
-       if (!hugepages_supported()) {
-               pr_warn("HugeTLB: huge pages not supported, ignoring hugepagesz = %s\n", s);
-               return 0;
-       }
-
        size = (unsigned long)memparse(s, NULL);
 
        if (!arch_hugetlb_valid_size(size)) {
@@ -3424,11 +3417,6 @@ static int __init default_hugepagesz_setup(char *s)
        unsigned long size;
 
        parsed_valid_hugepagesz = false;
-       if (!hugepages_supported()) {
-               pr_warn("HugeTLB: huge pages not supported, ignoring default_hugepagesz = %s\n", s);
-               return 0;
-       }
-
        if (parsed_default_hugepagesz) {
                pr_err("HugeTLB: default_hugepagesz previously specified, ignoring %s\n", s);
                return 0;