2 files changed, 7 insertions, 2 deletions

diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 802b082e216d..f80f5e2aec87 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -54,6 +54,11 @@ config ARCH_HAS_ILOG2_U64
         bool
         default n
 
+config HUGETLB_PAGE_SIZE_VARIABLE
+        bool
+        depends on HUGETLB_PAGE
+        default y
+
 config GENERIC_FIND_NEXT_BIT
         bool
         default y
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index a9ff685aea25..d3ce8f3bcaa6 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -194,6 +194,6 @@ static int __init hugetlb_setup_sz(char *str)
          * override here with new page shift.
          */
         ia64_set_rr(HPAGE_REGION_BASE, hpage_shift << 2);
-        return 1;
+        return 0;
 }
-__setup("hugepagesz=", hugetlb_setup_sz);
+early_param("hugepagesz", hugetlb_setup_sz);