Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 978e0f92 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "11 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kasan: do not sanitize kexec purgatory
  drivers/rapidio/devices/tsi721.c: make module parameter variable name unique
  mm/hugetlb.c: don't call region_abort if region_chg fails
  kasan: report only the first error by default
  hugetlbfs: initialize shared policy as part of inode allocation
  mm: fix section name for .data..ro_after_init
  mm, hugetlb: use pte_present() instead of pmd_present() in follow_huge_pmd()
  mm: workingset: fix premature shadow node shrinking with cgroups
  mm: rmap: fix huge file mmap accounting in the memcg stats
  mm: move mm_percpu_wq initialization earlier
  mm: migrate: fix remove_migration_pte() for ksm pages
parents a9f6b6b8 13a6798e

Documentation/admin-guide/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1725,6 +1725,12 @@ 
			kernel and module base offset ASLR (Address Space

			Layout Randomization).



	kasan_multi_shot

			[KNL] Enforce KASAN (Kernel Address Sanitizer) to print

			report on every invalid memory access. Without this

			parameter KASAN will print report only for the first

			invalid access.



	keepinitrd	[HW,ARM]



	kernelcore=	[KNL,X86,IA-64,PPC]

arch/s390/include/asm/sections.h

+0 −1
Original line number Diff line number Diff line
@@ -4,6 +4,5 @@ 
#include <asm-generic/sections.h>



extern char _eshared[], _ehead[];

extern char __start_ro_after_init[], __end_ro_after_init[];



#endif

arch/s390/kernel/vmlinux.lds.S

+0 −2
Original line number Diff line number Diff line
@@ -63,11 +63,9 @@ SECTIONS 


	. = ALIGN(PAGE_SIZE);

	__start_ro_after_init = .;

	__start_data_ro_after_init = .;

	.data..ro_after_init : {

		 *(.data..ro_after_init)

	}

	__end_data_ro_after_init = .;

	EXCEPTION_TABLE(16)

	. = ALIGN(PAGE_SIZE);

	__end_ro_after_init = .;

arch/x86/purgatory/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ PURGATORY_OBJS = $(addprefix $(obj)/,$(purgatory-y)) 
LDFLAGS_purgatory.ro := -e purgatory_start -r --no-undefined -nostdlib -z nodefaultlib

targets += purgatory.ro



KASAN_SANITIZE	:= n

KCOV_INSTRUMENT := n



# Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That

drivers/rapidio/devices/tsi721.c

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ 
#include "tsi721.h"



#ifdef DEBUG

u32 dbg_level;

module_param(dbg_level, uint, S_IWUSR | S_IRUGO);

u32 tsi_dbg_level;

module_param_named(dbg_level, tsi_dbg_level, uint, S_IWUSR | S_IRUGO);

MODULE_PARM_DESC(dbg_level, "Debugging output level (default 0 = none)");

#endif