Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48beb121 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew Morton) 

Merge misc fixes from Andrew Morton:
 "7 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm/debug_pagealloc: fix build failure on ppc and some other archs
  nilfs2: fix deadlock of segment constructor over I_SYNC flag
  MAINTAINERS: remove SUPERH website
  memcg, shmem: fix shmem migration to use lrucare
  mm: export "high_memory" symbol on !MMU
  .mailmap: update Konstantin Khlebnikov's email address
  mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
parents dbf3b7dd 7b02190c

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ Juha Yrjola <juha.yrjola@nokia.com> 
Juha Yrjola <juha.yrjola@solidboot.com>

Kay Sievers <kay.sievers@vrfy.org>

Kenneth W Chen <kenneth.w.chen@intel.com>

Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>

Koushik <raghavendra.koushik@neterion.com>

Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Leonid I Ananiev <leonid.i.ananiev@intel.com>

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -9241,7 +9241,6 @@ F: drivers/net/ethernet/dlink/sundance.c 


SUPERH

L:	linux-sh@vger.kernel.org

W:	http://www.linux-sh.org

Q:	http://patchwork.kernel.org/project/linux-sh/list/

S:	Orphan

F:	Documentation/sh/

arch/mn10300/include/asm/cacheflush.h

+0 −7
Original line number Diff line number Diff line
@@ -159,13 +159,6 @@ extern void flush_icache_range(unsigned long start, unsigned long end); 
#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)



/*

 * Internal debugging function

 */

#ifdef CONFIG_DEBUG_PAGEALLOC

extern void kernel_map_pages(struct page *page, int numpages, int enable);

#endif



#endif /* __ASSEMBLY__ */



#endif /* _ASM_CACHEFLUSH_H */

arch/powerpc/include/asm/cacheflush.h

+0 −7
Original line number Diff line number Diff line
@@ -60,13 +60,6 @@ extern void flush_dcache_phys_range(unsigned long start, unsigned long stop); 
#define copy_from_user_page(vma, page, vaddr, dst, src, len) \

	memcpy(dst, src, len)







#ifdef CONFIG_DEBUG_PAGEALLOC

/* internal debugging function */

void kernel_map_pages(struct page *page, int numpages, int enable);

#endif



#endif /* __KERNEL__ */



#endif /* _ASM_POWERPC_CACHEFLUSH_H */

arch/s390/include/asm/cacheflush.h

+0 −4
Original line number Diff line number Diff line
@@ -4,10 +4,6 @@ 
/* Caches aren't brain-dead on the s390. */

#include <asm-generic/cacheflush.h>



#ifdef CONFIG_DEBUG_PAGEALLOC

void kernel_map_pages(struct page *page, int numpages, int enable);

#endif



int set_memory_ro(unsigned long addr, int numpages);

int set_memory_rw(unsigned long addr, int numpages);

int set_memory_nx(unsigned long addr, int numpages);