Commit e28c0d7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fixes from Andrew Morton:
 "14 patches.

  Subsystems affected by this patch series: mm (migration, vmscan, slub,
  gup, memcg, hugetlbfs), mailmap, kbuild, reboot, watchdog, panic, and
  ocfs2"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  ocfs2: initialize ip_next_orphan
  panic: don't dump stack twice on warn
  hugetlbfs: fix anon huge page migration race
  mm: memcontrol: fix missing wakeup polling thread
  kernel/watchdog: fix watchdog_allowed_mask not used warning
  reboot: fix overflow parsing reboot cpu number
  Revert "kernel/reboot.c: convert simple_strtoul to kstrtoint"
  compiler.h: fix barrier_data() on clang
  mm/gup: use unpin_user_pages() in __gup_longterm_locked()
  mm/slub: fix panic in slab_alloc_node()
  mailmap: fix entry for Dmitry Baryshkov/Eremin-Solenikov
  mm/vmscan: fix NR_ISOLATED_FILE corruption on 64-bit
  mm/compaction: stop isolation if too many pages are isolated and we have pages to migrate
  mm/compaction: count pages and stop correctly during page isolation
parents 31908a60 f5785283

.mailmap

+4 −1
Original line number Diff line number Diff line
@@ -82,7 +82,10 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com> 
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>

Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>

<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>

Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <[dbaryshkov@gmail.com]>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_baryshkov@mentor.com>

Dmitry Baryshkov <dbaryshkov@gmail.com> <dmitry_eremin@mentor.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dima@arista.com>

Dmitry Safonov <0x7f454c46@gmail.com> <d.safonov@partner.samsung.com>

Dmitry Safonov <0x7f454c46@gmail.com> <dsafonov@virtuozzo.com>

fs/ocfs2/super.c

+1 −0
Original line number Diff line number Diff line
@@ -1713,6 +1713,7 @@ static void ocfs2_inode_init_once(void *data) 


	oi->ip_blkno = 0ULL;

	oi->ip_clusters = 0;

	oi->ip_next_orphan = NULL;



	ocfs2_resv_init_once(&oi->ip_la_data_resv);

include/asm-generic/barrier.h

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 


#ifndef __ASSEMBLY__



#include <linux/compiler.h>

#include <asm/rwonce.h>



#ifndef nop

include/linux/compiler-clang.h

+0 −6
Original line number Diff line number Diff line
@@ -60,12 +60,6 @@ 
#define COMPILER_HAS_GENERIC_BUILTIN_OVERFLOW 1

#endif



/* The following are for compatibility with GCC, from compiler-gcc.h,

 * and may be redefined here because they should not be shared with other

 * compilers, like ICC.

 */

#define barrier() __asm__ __volatile__("" : : : "memory")



#if __has_feature(shadow_call_stack)

# define __noscs	__attribute__((__no_sanitize__("shadow-call-stack")))

#endif

include/linux/compiler-gcc.h

+0 −19
Original line number Diff line number Diff line
@@ -15,25 +15,6 @@ 
# error Sorry, your version of GCC is too old - please use 4.9 or newer.

#endif



/* Optimization barrier */



/* The "volatile" is due to gcc bugs */

#define barrier() __asm__ __volatile__("": : :"memory")

/*

 * This version is i.e. to prevent dead stores elimination on @ptr

 * where gcc and llvm may behave differently when otherwise using

 * normal barrier(): while gcc behavior gets along with a normal

 * barrier(), llvm needs an explicit input variable to be assumed

 * clobbered. The issue is as follows: while the inline asm might

 * access any memory it wants, the compiler could have fit all of

 * @ptr into memory registers instead, and since @ptr never escaped

 * from that, it proved that the inline asm wasn't touching any of

 * it. This version works well with both compilers, i.e. we're telling

 * the compiler that the inline asm absolutely may see the contents

 * of @ptr. See also: https://llvm.org/bugs/show_bug.cgi?id=15495

 */

#define barrier_data(ptr) __asm__ __volatile__("": :"r"(ptr) :"memory")



/*

 * This macro obfuscates arithmetic on a variable address so that gcc

 * shouldn't recognize the original var, and make assumptions about it.

CRA Git | Maintained and supported by SUSTech CRA and CCSE