---

yaml --- r: 362766 b: refs/heads/master c: 7919e91 h: refs/heads/master v: v3
git-mirror · Apr 17, 2013 · 017659e · 017659e
1 parent 12e5471
commit 017659e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f752ac4d7d96159776b0eea47489796bd90856fd
+refs/heads/master: 7919e91b34316ee30b14334389e005eb2e9b8e39
diff --git a/trunk/arch/s390/mm/init.c b/trunk/arch/s390/mm/init.c
@@ -63,10 +63,18 @@ static unsigned long __init setup_zero_pages(void)
 		break;
 	case 0x2097:	/* z10 */
 	case 0x2098:	/* z10 */
-	default:
+	case 0x2817:	/* z196 */
+	case 0x2818:	/* z196 */
 		order = 2;
 		break;
+	case 0x2827:	/* zEC12 */
+	default:
+		order = 5;
+		break;
 	}
+	/* Limit number of empty zero pages for small memory sizes */
+	if (order > 2 && totalram_pages <= 16384)
+		order = 2;
 
 	empty_zero_page = __get_free_pages(GFP_KERNEL | __GFP_ZERO, order);
 	if (!empty_zero_page)