Stephen Rothwell 6a328f3fe0 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>
2013-11-18 15:08:52 -08:00
..
2013-11-15 14:05:15 -08:00
2013-11-16 12:45:55 -08:00
2013-11-15 14:27:22 -08:00
2013-11-15 14:05:15 -08:00
2013-11-15 09:32:17 +09:00
2013-11-15 14:05:15 -08:00
2013-11-15 14:05:15 -08:00
2013-11-15 14:26:38 -08:00
2013-11-15 14:05:15 -08:00
2013-11-18 15:08:52 -08:00
2013-11-15 09:32:19 +09:00
2013-11-16 12:21:40 -08:00