Commit 58d4e450 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "14 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: revert x86_64 and arm64 ELF_ET_DYN_BASE base changes
  mm/vmalloc.c: don't unconditonally use __GFP_HIGHMEM
  mm/mempolicy: fix use after free when calling get_mempolicy
  mm/cma_debug.c: fix stack corruption due to sprintf usage
  signal: don't remove SIGNAL_UNKILLABLE for traced tasks.
  mm, oom: fix potential data corruption when oom_reaper races with writer
  mm: fix double mmap_sem unlock on MMF_UNSTABLE enforced SIGBUS
  slub: fix per memcg cache leak on css offline
  mm: discard memblock data later
  test_kmod: fix description for -s -and -c parameters
  kmod: fix wait on recursive loop
  wait: add wait_event_killable_timeout()
  kernel/watchdog: fix Kconfig constraints for perf hardlockup watchdog
  mm: memcontrol: fix NULL pointer crash in test_clear_page_writeback()
parents cc28fcdc c715b72c

arch/arm64/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -114,10 +114,10 @@ 


/*

 * This is the base location for PIE (ET_DYN with INTERP) loads. On

 * 64-bit, this is raised to 4GB to leave the entire 32-bit address

 * 64-bit, this is above 4GB to leave the entire 32-bit address

 * space open for things that want to use the area for 32-bit pointers.

 */

#define ELF_ET_DYN_BASE		0x100000000UL

#define ELF_ET_DYN_BASE		(2 * TASK_SIZE_64 / 3)



#ifndef __ASSEMBLY__

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ config PPC 
	select HAVE_OPTPROBES			if PPC64

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI		if PPC64

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_RCU_TABLE_FREE		if SMP

arch/x86/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ config X86 
	select HAVE_PCSPKR_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_PERF_EVENTS_NMI

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if HAVE_PERF_EVENTS_NMI

	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_REGS_AND_STACK_ACCESS_API

arch/x86/include/asm/elf.h

+2 −2
Original line number Diff line number Diff line
@@ -247,11 +247,11 @@ extern int force_personality32; 


/*

 * This is the base location for PIE (ET_DYN with INTERP) loads. On

 * 64-bit, this is raised to 4GB to leave the entire 32-bit address

 * 64-bit, this is above 4GB to leave the entire 32-bit address

 * space open for things that want to use the area for 32-bit pointers.

 */

#define ELF_ET_DYN_BASE		(mmap_is_ia32() ? 0x000400000UL : \

						  0x100000000UL)

						  (TASK_SIZE / 3 * 2))



/* This yields a mask that user programs can use to figure out what

   instruction set this CPU supports.  This could be done in user space,

include/linux/memblock.h

+4 −2
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ extern int memblock_debug; 
#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK

#define __init_memblock __meminit

#define __initdata_memblock __meminitdata

void memblock_discard(void);

#else

#define __init_memblock

#define __initdata_memblock
@@ -74,8 +75,6 @@ phys_addr_t memblock_find_in_range_node(phys_addr_t size, phys_addr_t align, 
					int nid, ulong flags);

phys_addr_t memblock_find_in_range(phys_addr_t start, phys_addr_t end,

				   phys_addr_t size, phys_addr_t align);

phys_addr_t get_allocated_memblock_reserved_regions_info(phys_addr_t *addr);

phys_addr_t get_allocated_memblock_memory_regions_info(phys_addr_t *addr);

void memblock_allow_resize(void);

int memblock_add_node(phys_addr_t base, phys_addr_t size, int nid);

int memblock_add(phys_addr_t base, phys_addr_t size);
@@ -110,6 +109,9 @@ void __next_mem_range_rev(u64 *idx, int nid, ulong flags, 
void __next_reserved_mem_region(u64 *idx, phys_addr_t *out_start,

				phys_addr_t *out_end);



void __memblock_free_early(phys_addr_t base, phys_addr_t size);

void __memblock_free_late(phys_addr_t base, phys_addr_t size);



/**

 * for_each_mem_range - iterate through memblock areas from type_a and not

 * included in type_b. Or just type_a if type_b is NULL.

CRA Git | Maintained and supported by SUSTech CRA and CCSE