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 37b3a8ff3e ("sparc64: Move from 4MB to 8MB huge pages") and commit 1ae9ae5f7d ("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
..
extable.c
fault_32.c	arch: mm: pass userspace fault flag to generic fault handler	2013-09-12 15:38:01 -07:00
fault_64.c	sparc64: Implement HAVE_CONTEXT_TRACKING	2013-11-14 14:57:21 -08:00
gup.c	sparc64: Encode huge PMDs using PTE encoding.	2013-11-13 12:33:08 -08:00
highmem.c
hugetlbpage.c	sparc64: Clean up 64-bit mmap exclusion defines.	2013-11-12 15:22:33 -08:00
hypersparc.S
init_32.c
init_64.c	sparc64: merge fix	2013-11-18 15:08:52 -08:00
init_64.h	sparc64: Document the shift counts used to validate linear kernel addresses.	2013-11-12 15:22:34 -08:00
io-unit.c
iommu.c
leon_mm.c
Makefile
srmmu_access.S
srmmu.c	sparc: handle pgtable_page_ctor() fail	2013-11-15 09:32:19 +09:00
srmmu.h
swift.S
tlb.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next	2013-11-15 14:16:30 +09:00
tsb.c	sparc64: Move from 4MB to 8MB huge pages.	2013-11-12 15:22:34 -08:00
tsunami.S
ultra.S	sparc64: Make PAGE_OFFSET variable.	2013-11-12 15:22:34 -08:00
viking.S