Commit 1ea9d333 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-stable-2022-12-17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm 

Pull more mm updates from Andrew Morton:

 - A few late-breaking minor fixups

 - Two minor feature patches which were awkwardly dependent on mm-nonmm.
   I need to set up a new branch to handle such things.

* tag 'mm-stable-2022-12-17-2' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  MAINTAINERS: zram: zsmalloc: Add an additional co-maintainer
  mm/kmemleak: use %pK to display kernel pointers in backtrace
  mm: use stack_depot for recording kmemleak's backtrace
  maple_tree: update copyright dates for test code
  maple_tree: fix mas_find_rev() comment
  mm/gup_test: free memory allocated via kvcalloc() using kvfree()
parents 4f292c4d 8b777594

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,10 @@ N: Justin Guyett 
E: jguyett@andrew.cmu.edu

D: via-rhine net driver hacking



N: Nitin Gupta

E: ngupta@vflare.org

D: zsmalloc memory allocator and zram block device driver



N: Danny ter Haar

E: dth@cistron.nl

D: /proc/cpuinfo, reboot on panic , kernel pre-patch tester ;)

MAINTAINERS

+2 −4
Original line number Diff line number Diff line
@@ -23055,8 +23055,7 @@ F: drivers/media/pci/zoran/ 








ZRAM COMPRESSED RAM BLOCK DEVICE DRVIER









M:	Minchan Kim <minchan@kernel.org>









M:	Nitin Gupta <ngupta@vflare.org>









R:	Sergey Senozhatsky <senozhatsky@chromium.org>









M:	Sergey Senozhatsky <senozhatsky@chromium.org>









L:	linux-kernel@vger.kernel.org









S:	Maintained









F:	Documentation/admin-guide/blockdev/zram.rst








@@ -23069,8 +23068,7 @@ F:	drivers/tty/serial/zs.*















ZSMALLOC COMPRESSED SLAB MEMORY ALLOCATOR









M:	Minchan Kim <minchan@kernel.org>









M:	Nitin Gupta <ngupta@vflare.org>









R:	Sergey Senozhatsky <senozhatsky@chromium.org>









M:	Sergey Senozhatsky <senozhatsky@chromium.org>









L:	linux-mm@kvack.org









S:	Maintained









F:	Documentation/mm/zsmalloc.rst

























lib/Kconfig.debug



+1
−0






























Original line number
Diff line number
Diff line







@@ -728,6 +728,7 @@ config DEBUG_KMEMLEAK







	select STACKTRACE if STACKTRACE_SUPPORT









	select KALLSYMS









	select CRC32









	select STACKDEPOT









	help









	  Say Y here if you want to enable the memory leak









	  detector. The memory allocation/freeing is traced in a way
































lib/maple_tree.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -6062,7 +6062,7 @@ void *mas_find_rev(struct ma_state *mas, unsigned long min)







	if (mas->index < min)









		return NULL;



















	/* Retries on dead nodes handled by mas_next_entry */









	/* Retries on dead nodes handled by mas_prev_entry */









	return mas_prev_entry(mas, min);









}









EXPORT_SYMBOL_GPL(mas_find_rev);
































mm/gup_test.c



+2
−2






























Original line number
Diff line number
Diff line







@@ -214,7 +214,7 @@ static inline void pin_longterm_test_stop(void)







		if (pin_longterm_test_nr_pages)









			unpin_user_pages(pin_longterm_test_pages,









					 pin_longterm_test_nr_pages);









		kfree(pin_longterm_test_pages);









		kvfree(pin_longterm_test_pages);









		pin_longterm_test_pages = NULL;









		pin_longterm_test_nr_pages = 0;









	}








@@ -255,7 +255,7 @@ static inline int pin_longterm_test_start(unsigned long arg)







	fast = !!(args.flags & PIN_LONGTERM_TEST_FLAG_USE_FAST);



















	if (!fast && mmap_read_lock_killable(current->mm)) {









		kfree(pages);









		kvfree(pages);









		return -EINTR;









	}