sparc64: merge fix
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 18 Nov 2013 03:19:33 +0000 (14:19 +1100)
committerDavid S. Miller <davem@davemloft.net>
Mon, 18 Nov 2013 23:08:52 +0000 (15:08 -0800)
commit6a328f3fe042396c6525d7bf84cfd941440cc045
tree65453ab482c442d8d1f2dbe45e4502248041e7e7
parent6469c842ec57f5062224bb5b86e6d38784b8d6c0
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>
arch/sparc/mm/init_64.c