Commit 18737f42 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge more updates from Andrew Morton:
 "Subsystems affected by this patch series: mm/hotfixes, lz4, exec,
  mailmap, mm/thp, autofs, sysctl, mm/kmemleak, mm/misc and lib"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (35 commits)
  virtio: pci: constify ioreadX() iomem argument (as in generic implementation)
  ntb: intel: constify ioreadX() iomem argument (as in generic implementation)
  rtl818x: constify ioreadX() iomem argument (as in generic implementation)
  iomap: constify ioreadX() iomem argument (as in generic implementation)
  sh: use generic strncpy()
  sh: clkfwk: remove r8/r16/r32
  include/asm-generic/vmlinux.lds.h: align ro_after_init
  mm: annotate a data race in page_zonenum()
  mm/swap.c: annotate data races for lru_rotate_pvecs
  mm/rmap: annotate a data race at tlb_flush_batched
  mm/mempool: fix a data race in mempool_free()
  mm/list_lru: fix a data race in list_lru_count_one
  mm/memcontrol: fix a data race in scan count
  mm/page_counter: fix various data races at memsw
  mm/swapfile: fix and annotate various data races
  mm/filemap.c: fix a data race in filemap_fault()
  mm/swap_state: mark various intentional data races
  mm/page_io: mark various intentional data races
  mm/frontswap: mark various intentional data races
  mm/kmemleak: silence KCSAN splats in checksum
  ...
parents c9c9735c fe0580ac

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -104,6 +104,7 @@ Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com> 
Greg Kroah-Hartman <greg@echidna.(none)>

Greg Kroah-Hartman <gregkh@suse.de>

Greg Kroah-Hartman <greg@kroah.com>

Greg Kurz <groug@kaod.org> <gkurz@linux.vnet.ibm.com>

Gregory CLEMENT <gregory.clement@bootlin.com> <gregory.clement@free-electrons.com>

Hanjun Guo <guohanjun@huawei.com> <hanjun.guo@linaro.org>

Heiko Carstens <hca@linux.ibm.com> <h.carstens@de.ibm.com>

arch/alpha/include/asm/core_apecs.h

+3 −3
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ struct el_apecs_procdata 
		}						\

	} while (0)



__EXTERN_INLINE unsigned int apecs_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -420,7 +420,7 @@ __EXTERN_INLINE void apecs_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int apecs_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -456,7 +456,7 @@ __EXTERN_INLINE void apecs_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int apecs_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int apecs_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < APECS_DENSE_MEM)

arch/alpha/include/asm/core_cia.h

+3 −3
Original line number Diff line number Diff line
@@ -342,7 +342,7 @@ struct el_CIA_sysdata_mcheck { 
#define vuip	volatile unsigned int __force *

#define vulp	volatile unsigned long __force *



__EXTERN_INLINE unsigned int cia_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -374,7 +374,7 @@ __EXTERN_INLINE void cia_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int cia_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -404,7 +404,7 @@ __EXTERN_INLINE void cia_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int cia_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int cia_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < CIA_DENSE_MEM)

arch/alpha/include/asm/core_lca.h

+3 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ union el_lca { 
	} while (0)





__EXTERN_INLINE unsigned int lca_ioread8(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread8(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -266,7 +266,7 @@ __EXTERN_INLINE void lca_iowrite8(u8 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int lca_ioread16(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread16(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	unsigned long result, base_and_type;
@@ -302,7 +302,7 @@ __EXTERN_INLINE void lca_iowrite16(u16 b, void __iomem *xaddr) 
	*(vuip) ((addr << 5) + base_and_type) = w;

}



__EXTERN_INLINE unsigned int lca_ioread32(void __iomem *xaddr)

__EXTERN_INLINE unsigned int lca_ioread32(const void __iomem *xaddr)

{

	unsigned long addr = (unsigned long) xaddr;

	if (addr < LCA_DENSE_MEM)

arch/alpha/include/asm/core_marvel.h

+2 −2
Original line number Diff line number Diff line
@@ -332,10 +332,10 @@ struct io7 { 
#define vucp	volatile unsigned char __force *

#define vusp	volatile unsigned short __force *



extern unsigned int marvel_ioread8(void __iomem *);

extern unsigned int marvel_ioread8(const void __iomem *);

extern void marvel_iowrite8(u8 b, void __iomem *);



__EXTERN_INLINE unsigned int marvel_ioread16(void __iomem *addr)

__EXTERN_INLINE unsigned int marvel_ioread16(const void __iomem *addr)

{

	return __kernel_ldwu(*(vusp)addr);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE