RE: linux-next: build failure after merge of the final tree
From: Kirill A. Shutemov <hidden>
Date: 2013-11-18 08:50:04
Also in:
lkml
Stephen Rothwell wrote:
Hi all,
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 37b3a8ff3e08 ("sparc64: Move from 4MB
to 8MB huge pages") and commit 1ae9ae5f7df7 ("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 :-().
From: Stephen Rothwell <redacted>
Date: Mon, 18 Nov 2013 14:16:40 +1100
Subject: [PATCH] sparc64: merge fix
Signed-off-by: Stephen Rothwell <redacted>Acked-by: Kirill A. Shutemov <redacted>
quoted hunk ↗ jump to hunk
--- arch/sparc/mm/init_64.c | 2 -- 1 file changed, 2 deletions(-)diff --git a/arch/sparc/mm/init_64.c b/arch/sparc/mm/init_64.c index 6b643790e4fe..5322e530d09c 100644 --- 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)) {-- 1.8.4.3 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
-- Kirill A. Shutemov