sparc64: merge fix

After merging the final tree, today's linux-next build (sparc64 defconfig) failed like this: arch/sparc/mm/init_64.c: In function 'pte_alloc_one': arch/sparc/mm/init_64.c:2568:9: error: unused variable 'pte' [-Werror=unused-variable] Caused by the merge between commit 37b3a8f ("sparc64: Move from 4MB to 8MB huge pages") and commit 1ae9ae5 ("sparc: handle pgtable_page_ctor() fail") (I had the following merge fix in linux-next, but it didn't seem to propagate upstream - may have forgotten to point it out :-(). Signed-off-by: Stephen Rothwell <[email protected]> Acked-by: Kirill A. Shutemov <[email protected]> Signed-off-by: David S. Miller <[email protected]>
wentasah · Nov 18, 2013 · 6a328f3 · 6a328f3
1 parent 6469c84
commit 6a328f3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c
@@ -2565,8 +2565,6 @@ pgtable_t pte_alloc_one(struct mm_struct *mm,
 {
 	struct page *page = alloc_page(GFP_KERNEL | __GFP_NOTRACK |
 				       __GFP_REPEAT | __GFP_ZERO);
-	pte_t *pte = NULL;
-
 	if (!page)
 		return NULL;
 	if (!pgtable_page_ctor(page)) {