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

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "21 patches.

  Subsystems affected by this patch series: MAINTAINERS, mailmap, and mm
  (mlock, pagecache, damon, slub, memcg, hugetlb, and pagecache)"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (21 commits)
  mm: bdi: initialize bdi_min_ratio when bdi is unregistered
  hugetlbfs: fix issue of preallocation of gigantic pages can't work
  mm/memcg: relocate mod_objcg_mlstate(), get_obj_stock() and put_obj_stock()
  mm/slub: fix endianness bug for alloc/free_traces attributes
  selftests/damon: split test cases
  selftests/damon: test debugfs file reads/writes with huge count
  selftests/damon: test wrong DAMOS condition ranges input
  selftests/damon: test DAMON enabling with empty target_ids case
  selftests/damon: skip test if DAMON is running
  mm/damon/vaddr-test: remove unnecessary variables
  mm/damon/vaddr-test: split a test function having >1024 bytes frame size
  mm/damon/vaddr: remove an unnecessary warning message
  mm/damon/core: remove unnecessary error messages
  mm/damon/dbgfs: remove an unnecessary error message
  mm/damon/core: use better timer mechanisms selection threshold
  mm/damon/core: fix fake load reports due to uninterruptible sleeps
  timers: implement usleep_idle_range()
  filemap: remove PageHWPoison check from next_uptodate_page()
  mailmap: update email address for Guo Ren
  MAINTAINERS: update kdump maintainers
  ...
parents 6f513529 3c376dfa

.mailmap

+2 −0
Original line number Diff line number Diff line
@@ -126,6 +126,8 @@ 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>

Guo Ren <guoren@kernel.org> <guoren@linux.alibaba.com>

Guo Ren <guoren@kernel.org> <ren_guo@c-sky.com>

Gustavo Padovan <gustavo@las.ic.unicamp.br>

Gustavo Padovan <padovan@profusion.mobi>

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

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -10279,9 +10279,9 @@ F: lib/Kconfig.kcsan 
F:	scripts/Makefile.kcsan









KDUMP









M:	Dave Young <dyoung@redhat.com>









M:	Baoquan He <bhe@redhat.com>









R:	Vivek Goyal <vgoyal@redhat.com>









R:	Dave Young <dyoung@redhat.com>









L:	kexec@lists.infradead.org









S:	Maintained









W:	http://lse.sourceforge.net/kdump/
































include/linux/delay.h



+13
−1






























Original line number
Diff line number
Diff line







@@ -20,6 +20,7 @@







 */



















#include <linux/math.h>









#include <linux/sched.h>



















extern unsigned long loops_per_jiffy;


















@@ -58,7 +59,18 @@ void calibrate_delay(void);







void __attribute__((weak)) calibration_delay_done(void);









void msleep(unsigned int msecs);









unsigned long msleep_interruptible(unsigned int msecs);









void usleep_range(unsigned long min, unsigned long max);









void usleep_range_state(unsigned long min, unsigned long max,









			unsigned int state);



















static inline void usleep_range(unsigned long min, unsigned long max)









{









	usleep_range_state(min, max, TASK_UNINTERRUPTIBLE);









}



















static inline void usleep_idle_range(unsigned long min, unsigned long max)









{









	usleep_range_state(min, max, TASK_IDLE);









}



















static inline void ssleep(unsigned int seconds)









{
































include/uapi/linux/resource.h



+10
−3






























Original line number
Diff line number
Diff line







@@ -66,10 +66,17 @@ struct rlimit64 {







#define _STK_LIM	(8*1024*1024)



















/*









 * GPG2 wants 64kB of mlocked memory, to make sure pass phrases









 * and other sensitive information are never written to disk.









 * Limit the amount of locked memory by some sane default:









 * root can always increase this limit if needed.









 *









 * The main use-cases are (1) preventing sensitive memory









 * from being swapped; (2) real-time operations; (3) via









 * IOURING_REGISTER_BUFFERS.









 *









 * The first two don't need much. The latter will take as









 * much as it can get. 8MB is a reasonably sane default.









 */









#define MLOCK_LIMIT	((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024)









#define MLOCK_LIMIT	(8*1024*1024)



















/*









 * Due to binary compatibility, the actual resource numbers
































kernel/time/timer.c



+9
−7






























Original line number
Diff line number
Diff line







@@ -2054,26 +2054,28 @@ unsigned long msleep_interruptible(unsigned int msecs)







EXPORT_SYMBOL(msleep_interruptible);



















/**









 * usleep_range - Sleep for an approximate time









 * usleep_range_state - Sleep for an approximate time in a given state









 * @min:	Minimum time in usecs to sleep









 * @max:	Maximum time in usecs to sleep









 * @state:	State of the current task that will be while sleeping









 *









 * In non-atomic context where the exact wakeup time is flexible, use









 * usleep_range() instead of udelay().  The sleep improves responsiveness









 * usleep_range_state() instead of udelay().  The sleep improves responsiveness









 * by avoiding the CPU-hogging busy-wait of udelay(), and the range reduces









 * power usage by allowing hrtimers to take advantage of an already-









 * scheduled interrupt instead of scheduling a new one just for this sleep.









 */









void __sched usleep_range(unsigned long min, unsigned long max)









void __sched usleep_range_state(unsigned long min, unsigned long max,









				unsigned int state)









{









	ktime_t exp = ktime_add_us(ktime_get(), min);









	u64 delta = (u64)(max - min) * NSEC_PER_USEC;



















	for (;;) {









		__set_current_state(TASK_UNINTERRUPTIBLE);









		__set_current_state(state);









		/* Do not return before the requested sleep time has elapsed */









		if (!schedule_hrtimeout_range(&exp, delta, HRTIMER_MODE_ABS))









			break;









	}









}









EXPORT_SYMBOL(usleep_range);








EXPORT_SYMBOL(usleep_range_state);