From e7bb096711c8da77e3eeaaf8d772242ba8817028 Mon Sep 17 00:00:00 2001
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Mon, 7 May 2012 10:32:22 -0400
Subject: [PATCH] --- yaml --- r: 304083 b: refs/heads/master c:
 89528127fa5f4aca0483203c87c945555d057770 h: refs/heads/master i:   304081:
 dc422bb1bc73f7d47ec6626916e6ecf9b301ab6b   304079:
 57d5d9eabc317c6ebc01169b2ca2ad83d56b6488 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/mm/hugetlbpage.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 3d7cf2ec047d..e9275cb3f6c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9ff1f838e9c019b16b720dca9b04565f1a6e0316
+refs/heads/master: 89528127fa5f4aca0483203c87c945555d057770
diff --git a/trunk/arch/powerpc/mm/hugetlbpage.c b/trunk/arch/powerpc/mm/hugetlbpage.c
index fb05b123218f..1a6de0a7d8eb 100644
--- a/trunk/arch/powerpc/mm/hugetlbpage.c
+++ b/trunk/arch/powerpc/mm/hugetlbpage.c
@@ -271,7 +271,8 @@ int alloc_bootmem_huge_page(struct hstate *hstate)
 
 unsigned long gpage_npages[MMU_PAGE_COUNT];
 
-static int __init do_gpage_early_setup(char *param, char *val)
+static int __init do_gpage_early_setup(char *param, char *val,
+				       const char *unused)
 {
 	static phys_addr_t size;
 	unsigned long npages;