Commit 12ee72fe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'mm-hotfixes-stable-2023-11-17-14-04' of... 

Merge tag 'mm-hotfixes-stable-2023-11-17-14-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull misc fixes from Andrew Morton:
 "Thirteen hotfixes. Seven are cc:stable and the remainder pertain to
  post-6.6 issues or aren't considered suitable for backporting"

* tag 'mm-hotfixes-stable-2023-11-17-14-04' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  mm: more ptep_get() conversion
  parisc: fix mmap_base calculation when stack grows upwards
  mm/damon/core.c: avoid unintentional filtering out of schemes
  mm: kmem: drop __GFP_NOFAIL when allocating objcg vectors
  mm/damon/sysfs-schemes: handle tried region directory allocation failure
  mm/damon/sysfs-schemes: handle tried regions sysfs directory allocation failure
  mm/damon/sysfs: check error from damon_sysfs_update_target()
  mm: fix for negative counter: nr_file_hugepages
  selftests/mm: add hugetlb_fault_after_madv to .gitignore
  selftests/mm: restore number of hugepages
  selftests: mm: fix some build warnings
  selftests: mm: skip whole test instead of failure
  mm/damon/sysfs: eliminate potential uninitialized variable warning
parents ffd75bc7 afccb080

arch/parisc/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -140,11 +140,11 @@ config ARCH_MMAP_RND_COMPAT_BITS_MIN 
	default 8



config ARCH_MMAP_RND_BITS_MAX

	default 24 if 64BIT

	default 17

	default 18 if 64BIT

	default 13



config ARCH_MMAP_RND_COMPAT_BITS_MAX

	default 17

	default 13



# unless you want to implement ACPI on PA-RISC ... ;-)

config PM

arch/parisc/include/asm/elf.h

+1 −9
Original line number Diff line number Diff line
@@ -349,15 +349,7 @@ struct pt_regs; /* forward declaration... */ 


#define ELF_HWCAP	0



/* Masks for stack and mmap randomization */

#define BRK_RND_MASK	(is_32bit_task() ? 0x07ffUL : 0x3ffffUL)

#define MMAP_RND_MASK	(is_32bit_task() ? 0x1fffUL : 0x3ffffUL)

#define STACK_RND_MASK	MMAP_RND_MASK



struct mm_struct;

extern unsigned long arch_randomize_brk(struct mm_struct *);

#define arch_randomize_brk arch_randomize_brk



#define STACK_RND_MASK	0x7ff	/* 8MB of VA */



#define ARCH_HAS_SETUP_ADDITIONAL_PAGES 1

struct linux_binprm;

arch/parisc/include/asm/processor.h

+2 −0
Original line number Diff line number Diff line
@@ -47,6 +47,8 @@ 


#ifndef __ASSEMBLY__



struct rlimit;

unsigned long mmap_upper_limit(struct rlimit *rlim_stack);

unsigned long calc_max_stack_size(unsigned long stack_max);



/*

arch/parisc/kernel/sys_parisc.c

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ unsigned long calc_max_stack_size(unsigned long stack_max) 
 * indicating that "current" should be used instead of a passed-in

 * value from the exec bprm as done with arch_pick_mmap_layout().

 */

static unsigned long mmap_upper_limit(struct rlimit *rlim_stack)

unsigned long mmap_upper_limit(struct rlimit *rlim_stack)

{

	unsigned long stack_base;

mm/damon/core.c

+1 −1
Original line number Diff line number Diff line
@@ -924,7 +924,7 @@ static bool __damos_filter_out(struct damon_ctx *ctx, struct damon_target *t, 
		matched = true;

		break;

	default:

		break;

		return false;

	}



	return matched == filter->matching;