---

yaml --- r: 304083 b: refs/heads/master c: 8952812 h: refs/heads/master i: 304081: dc422bb 304079: 57d5d9e v: v3
git-mirror · May 7, 2012 · e7bb096 · e7bb096
1 parent e3d2b4e
commit e7bb096
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;