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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "17 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  hexagon: define ioremap_uc
  ocfs2: fix the crash due to call ocfs2_get_dlm_debug once less
  ocfs2: call journal flush to mark journal as empty after journal recovery when mount
  mm/hugetlb: defer freeing of huge pages if in non-task context
  mm/gup: fix memory leak in __gup_benchmark_ioctl
  mm/oom: fix pgtables units mismatch in Killed process message
  fs/posix_acl.c: fix kernel-doc warnings
  hexagon: work around compiler crash
  hexagon: parenthesize registers in asm predicates
  fs/namespace.c: make to_mnt_ns() static
  fs/nsfs.c: include headers for missing declarations
  fs/direct-io.c: include fs/internal.h for missing prototype
  mm: move_pages: return valid node id in status if the page is already on the target node
  memcg: account security cred as well to kmemcg
  kcov: fix struct layout for kcov_remote_arg
  mm/zsmalloc.c: fix the migrated zspage statistics.
  mm/memory_hotplug: shrink zones when offlining memory
parents a125bcda 7312b706

Documentation/dev-tools/kcov.rst

+5 −5
Original line number Diff line number Diff line
@@ -251,11 +251,11 @@ selectively from different subsystems. 
.. code-block:: c



    struct kcov_remote_arg {

	unsigned	trace_mode;

	unsigned	area_size;

	unsigned	num_handles;

	uint64_t	common_handle;

	uint64_t	handles[0];

	__u32		trace_mode;

	__u32		area_size;

	__u32		num_handles;

	__aligned_u64	common_handle;

	__aligned_u64	handles[0];

    };



    #define KCOV_INIT_TRACE			_IOR('c', 1, unsigned long)

arch/arm64/mm/mmu.c

+1 −3
Original line number Diff line number Diff line
@@ -1070,7 +1070,6 @@ void arch_remove_memory(int nid, u64 start, u64 size, 
{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	struct zone *zone;



	/*

	 * FIXME: Cleanup page tables (also in arch_add_memory() in case
@@ -1079,7 +1078,6 @@ void arch_remove_memory(int nid, u64 start, u64 size, 
	 * unplug. ARCH_ENABLE_MEMORY_HOTREMOVE must not be

	 * unlocked yet.

	 */

	zone = page_zone(pfn_to_page(start_pfn));

	__remove_pages(zone, start_pfn, nr_pages, altmap);

	__remove_pages(start_pfn, nr_pages, altmap);

}

#endif

arch/hexagon/include/asm/atomic.h

+4 −4
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static inline void atomic_##op(int i, atomic_t *v) \ 
		"1:	%0 = memw_locked(%1);\n"			\

		"	%0 = "#op "(%0,%2);\n"				\

		"	memw_locked(%1,P3)=%0;\n"			\

		"	if !P3 jump 1b;\n"				\

		"	if (!P3) jump 1b;\n"				\

		: "=&r" (output)					\

		: "r" (&v->counter), "r" (i)				\

		: "memory", "p3"					\
@@ -107,7 +107,7 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ 
		"1:	%0 = memw_locked(%1);\n"			\

		"	%0 = "#op "(%0,%2);\n"				\

		"	memw_locked(%1,P3)=%0;\n"			\

		"	if !P3 jump 1b;\n"				\

		"	if (!P3) jump 1b;\n"				\

		: "=&r" (output)					\

		: "r" (&v->counter), "r" (i)				\

		: "memory", "p3"					\
@@ -124,7 +124,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ 
		"1:	%0 = memw_locked(%2);\n"			\

		"	%1 = "#op "(%0,%3);\n"				\

		"	memw_locked(%2,P3)=%1;\n"			\

		"	if !P3 jump 1b;\n"				\

		"	if (!P3) jump 1b;\n"				\

		: "=&r" (output), "=&r" (val)				\

		: "r" (&v->counter), "r" (i)				\

		: "memory", "p3"					\
@@ -173,7 +173,7 @@ static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) 
		"	}"

		"	memw_locked(%2, p3) = %1;"

		"	{"

		"		if !p3 jump 1b;"

		"		if (!p3) jump 1b;"

		"	}"

		"2:"

		: "=&r" (__oldval), "=&r" (tmp)

arch/hexagon/include/asm/bitops.h

+4 −4
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ static inline int test_and_clear_bit(int nr, volatile void *addr) 
	"1:	R12 = memw_locked(R10);\n"

	"	{ P0 = tstbit(R12,R11); R12 = clrbit(R12,R11); }\n"

	"	memw_locked(R10,P1) = R12;\n"

	"	{if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"

	"	{if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"

	: "=&r" (oldval)

	: "r" (addr), "r" (nr)

	: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -62,7 +62,7 @@ static inline int test_and_set_bit(int nr, volatile void *addr) 
	"1:	R12 = memw_locked(R10);\n"

	"	{ P0 = tstbit(R12,R11); R12 = setbit(R12,R11); }\n"

	"	memw_locked(R10,P1) = R12;\n"

	"	{if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"

	"	{if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"

	: "=&r" (oldval)

	: "r" (addr), "r" (nr)

	: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -88,7 +88,7 @@ static inline int test_and_change_bit(int nr, volatile void *addr) 
	"1:	R12 = memw_locked(R10);\n"

	"	{ P0 = tstbit(R12,R11); R12 = togglebit(R12,R11); }\n"

	"	memw_locked(R10,P1) = R12;\n"

	"	{if !P1 jump 1b; %0 = mux(P0,#1,#0);}\n"

	"	{if (!P1) jump 1b; %0 = mux(P0,#1,#0);}\n"

	: "=&r" (oldval)

	: "r" (addr), "r" (nr)

	: "r10", "r11", "r12", "p0", "p1", "memory"
@@ -223,7 +223,7 @@ static inline int ffs(int x) 
	int r;



	asm("{ P0 = cmp.eq(%1,#0); %0 = ct0(%1);}\n"

		"{ if P0 %0 = #0; if !P0 %0 = add(%0,#1);}\n"

		"{ if (P0) %0 = #0; if (!P0) %0 = add(%0,#1);}\n"

		: "=&r" (r)

		: "r" (x)

		: "p0");

arch/hexagon/include/asm/cmpxchg.h

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ static inline unsigned long __xchg(unsigned long x, volatile void *ptr, 
	__asm__ __volatile__ (

	"1:	%0 = memw_locked(%1);\n"    /*  load into retval */

	"	memw_locked(%1,P0) = %2;\n" /*  store into memory */

	"	if !P0 jump 1b;\n"

	"	if (!P0) jump 1b;\n"

	: "=&r" (retval)

	: "r" (ptr), "r" (x)

	: "memory", "p0"

CRA Git | Maintained and supported by SUSTech CRA and CCSE