diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2013-11-18 14:19:33 +1100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-11-18 15:08:52 -0800 |
| commit | 6a328f3fe042396c6525d7bf84cfd941440cc045 (patch) | |
| tree | 65453ab482c442d8d1f2dbe45e4502248041e7e7 /arch/sparc/mm | |
| parent | 6469c842ec57f5062224bb5b86e6d38784b8d6c0 (diff) | |
| download | blackbird-op-linux-6a328f3fe042396c6525d7bf84cfd941440cc045.tar.gz blackbird-op-linux-6a328f3fe042396c6525d7bf84cfd941440cc045.zip | |
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 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 :-().
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/mm')
| -rw-r--r-- | arch/sparc/mm/init_64.c | 2 |
1 files changed, 0 insertions, 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)) { |
