Commit 5ab0fc15 authored by Andrew Morton's avatar Andrew Morton
Browse files

Sync mm-stable with mm-hotfixes-stable to pick up dependent patches 

Merge branch 'mm-hotfixes-stable' into mm-stable
parents 9a3f21fe ac86f547

.mailmap

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ Domen Puncer <domen@coderock.org> 
Douglas Gilbert <dougg@torque.net>

Ed L. Cashin <ecashin@coraid.com>

Erik Kaneda <erik.kaneda@intel.com> <erik.schmauss@intel.com>

Eugen Hristev <eugen.hristev@collabora.com> <eugen.hristev@microchip.com>

Evgeniy Polyakov <johnpol@2ka.mipt.ru>

Ezequiel Garcia <ezequiel@vanguardiasur.com.ar> <ezequiel@collabora.com>

Felipe W Damasio <felipewd@terra.com.br>

Documentation/admin-guide/cgroup-v2.rst

+6 −9
Original line number Diff line number Diff line
@@ -1245,13 +1245,17 @@ PAGE_SIZE multiple when read back. 
	This is a simple interface to trigger memory reclaim in the

	target cgroup.



	This file accepts a string which contains the number of bytes to

	reclaim.

	This file accepts a single key, the number of bytes to reclaim.

	No nested keys are currently supported.



	Example::



	  echo "1G" > memory.reclaim



	The interface can be later extended with nested keys to

	configure the reclaim behavior. For example, specify the

	type of memory to reclaim from (anon, file, ..).



	Please note that the kernel can over or under reclaim from

	the target cgroup. If less bytes are reclaimed than the

	specified amount, -EAGAIN is returned.
@@ -1263,13 +1267,6 @@ PAGE_SIZE multiple when read back. 
	This means that the networking layer will not adapt based on

	reclaim induced by memory.reclaim.



	This file also allows the user to specify the nodes to reclaim from,

	via the 'nodes=' key, for example::



	  echo "1G nodes=0,1" > memory.reclaim



	The above instructs the kernel to reclaim memory from nodes 0,1.



  memory.peak

	A read-only single value file which exists on non-root

	cgroups.

arch/ia64/kernel/sys_ia64.c

+5 −2
Original line number Diff line number Diff line
@@ -170,6 +170,9 @@ ia64_mremap (unsigned long addr, unsigned long old_len, unsigned long new_len, u 
asmlinkage long

ia64_clock_getres(const clockid_t which_clock, struct __kernel_timespec __user *tp)

{

	struct timespec64 rtn_tp;

	s64 tick_ns;



	/*

	 * ia64's clock_gettime() syscall is implemented as a vdso call

	 * fsys_clock_gettime(). Currently it handles only
@@ -185,8 +188,8 @@ ia64_clock_getres(const clockid_t which_clock, struct __kernel_timespec __user * 
	switch (which_clock) {

	case CLOCK_REALTIME:

	case CLOCK_MONOTONIC:

		s64 tick_ns = DIV_ROUND_UP(NSEC_PER_SEC, local_cpu_data->itc_freq);

		struct timespec64 rtn_tp = ns_to_timespec64(tick_ns);

		tick_ns = DIV_ROUND_UP(NSEC_PER_SEC, local_cpu_data->itc_freq);

		rtn_tp = ns_to_timespec64(tick_ns);

		return put_timespec64(&rtn_tp, tp);

	}

arch/sh/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Written by Niibe Yutaka and Paul Mundt

 */

OUTPUT_ARCH(sh)

#define RUNTIME_DISCARD_EXIT

#include <asm/thread_info.h>

#include <asm/cache.h>

#include <asm/vmlinux.lds.h>

drivers/of/fdt.c

+1 −5
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/serial_core.h>

#include <linux/sysfs.h>

#include <linux/random.h>

#include <linux/kmemleak.h>



#include <asm/setup.h>  /* for COMMAND_LINE_SIZE */

#include <asm/page.h>
@@ -525,12 +524,9 @@ static int __init __reserved_mem_reserve_reg(unsigned long node, 
		size = dt_mem_next_cell(dt_root_size_cells, &prop);



		if (size &&

		    early_init_dt_reserve_memory(base, size, nomap) == 0) {

		    early_init_dt_reserve_memory(base, size, nomap) == 0)

			pr_debug("Reserved memory: reserved region for node '%s': base %pa, size %lu MiB\n",

				uname, &base, (unsigned long)(size / SZ_1M));

			if (!nomap)

				kmemleak_alloc_phys(base, size, 0);

		}

		else

			pr_err("Reserved memory: failed to reserve memory for node '%s': base %pa, size %lu MiB\n",

			       uname, &base, (unsigned long)(size / SZ_1M));