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

sparc: Add module.h to files previously implicitly using it.

2011-10-31 19:30:54 -04:00

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

sparc32: move kmap_init() to highmem.c

2012-07-26 16:46:17 -07:00

hugetlbpage.c

sparc64: Clean up 64-bit mmap exclusion defines.

2013-11-12 15:22:33 -08:00

hypersparc.S

[PATCH] sparc32: vm_area_struct access for old Sun SPARCs.

2013-07-10 13:56:10 -07:00

init_32.c

mm/SPARC: prepare for removing num_physpages and simplify mem_init()

2013-07-03 16:07:37 -07:00

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

sparc32: Convert mmu_* interfaces from btfixup to method ops.

2012-05-13 13:57:05 -07:00

iommu.c

sparc/iommu: fix typo s/265KB/256KB/

2013-03-31 19:29:12 -04:00

leon_mm.c

sparc32: srmmu_probe now knows about leon too

2012-05-27 23:52:51 -07:00

Makefile

sparc32: introduce run-time patching of srmmu access functions

2012-05-27 23:52:49 -07:00

srmmu_access.S

sparc32: introduce run-time patching of srmmu access functions

2012-05-27 23:52:49 -07:00

srmmu.c

sparc: handle pgtable_page_ctor() fail

2013-11-15 09:32:19 +09:00

srmmu.h

sparc32,leon: move leon mmu functions to leon_mm.c

2012-05-19 23:27:38 -07:00

swift.S

[PATCH] sparc32: vm_area_struct access for old Sun SPARCs.

2013-07-10 13:56:10 -07:00

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

[PATCH] sparc32: vm_area_struct access for old Sun SPARCs.

2013-07-10 13:56:10 -07:00

ultra.S

sparc64: Make PAGE_OFFSET variable.

2013-11-12 15:22:34 -08:00

viking.S

[PATCH] sparc32: vm_area_struct access for old Sun SPARCs.

2013-07-10 13:56:10 -07:00