ia64: A few huge page fixes (patch by Rohit Seth).

arch/ia64/kernel/efi.c

@@ -411,8 +411,8 @@ efi_init (void)
 #ifdef CONFIG_HUGETLB_PAGE
 	/* Just duplicating the above algo for lpzone start */
 	for (cp = saved_command_line; *cp; ) {
-		if (memcmp(cp, "lpmem=", 8) == 0) {
-			cp += 8;
+		if (memcmp(cp, "lpmem=", 6) == 0) {
+			cp += 6;
 			htlbzone_pages = memparse(cp, &end);
 			htlbzone_pages = (htlbzone_pages >> HPAGE_SHIFT);
 			if (end != cp)

arch/ia64/mm/hugetlbpage.c

@@ -504,7 +504,7 @@ set_hugetlb_mem_size (int count)
 		lcount = count - htlbzone_pages;
 	if (lcount > 0) {	/*Increase the mem size. */
 		while (lcount--) {
-			page = alloc_pages(GFP_ATOMIC, HUGETLB_PAGE_ORDER);
+			page = alloc_pages(__GFP_HIGHMEM, HUGETLB_PAGE_ORDER);
 			if (page == NULL)
 				break;
 			map = page;

arch/ia64/mm/init.c

@@ -457,7 +457,7 @@ mem_init (void)
 			htlbzone_pages = (max_low_pfn >> ((HPAGE_SHIFT - PAGE_SHIFT) + 1));
 		INIT_LIST_HEAD(&htlbpage_freelist);
 		for (i = 0; i < htlbzone_pages; i++) {
-			page = alloc_pages(GFP_ATOMIC, HUGETLB_PAGE_ORDER);
+			page = alloc_pages(__GFP_HIGHMEM, HUGETLB_PAGE_ORDER);
 			if (!page)
 				break;
 			map = page;