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

Commit 968ef8de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "15 fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  lib/stackdepot: export save/fetch stack for drivers
  mm: kmemleak: scan .data.ro_after_init
  memcg: prevent memcg caches to be both OFF_SLAB & OBJFREELIST_SLAB
  coredump: fix unfreezable coredumping task
  mm/filemap: don't allow partially uptodate page for pipes
  mm/hugetlb: fix huge page reservation leak in private mapping error paths
  ocfs2: fix not enough credit panic
  Revert "console: don't prefer first registered if DT specifies stdout-path"
  mm: hwpoison: fix thp split handling in memory_failure()
  swapfile: fix memory corruption via malformed swapfile
  mm/cma.c: check the max limit for cma allocation
  scripts/bloat-o-meter: fix SIGPIPE
  shmem: fix pageflags after swapping DMA32 object
  mm, frontswap: make sure allocated frontswap map is assigned
  mm: remove extra newline from allocation stall warning
parents c5e4ca6d ae65a21f

arch/s390/kernel/vmlinux.lds.S

+2 −0
Original line number Diff line number Diff line
@@ -62,9 +62,11 @@ 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 = .;

drivers/of/base.c

+0 −2
Original line number Diff line number Diff line
@@ -2077,8 +2077,6 @@ void of_alias_scan(void * (*dt_alloc)(u64 size, u64 align)) 
			name = of_get_property(of_aliases, "stdout", NULL);

		if (name)

			of_stdout = of_find_node_opts_by_path(name, &of_stdout_options);

		if (of_stdout)

			console_set_by_of();

	}



	if (!of_aliases)

fs/coredump.c

+3 −0
Original line number Diff line number Diff line 
#include <linux/slab.h>

#include <linux/file.h>

#include <linux/fdtable.h>

#include <linux/freezer.h>

#include <linux/mm.h>

#include <linux/stat.h>

#include <linux/fcntl.h>
@@ -423,7 +424,9 @@ static int coredump_wait(int exit_code, struct core_state *core_state) 
	if (core_waiters > 0) {

		struct core_thread *ptr;



		freezer_do_not_count();

		wait_for_completion(&core_state->startup);

		freezer_count();

		/*

		 * Wait for all the threads to become inactive, so that

		 * all the thread context (extended register state, like

fs/ocfs2/dir.c

+1 −1
Original line number Diff line number Diff line
@@ -3699,7 +3699,7 @@ static void ocfs2_dx_dir_transfer_leaf(struct inode *dir, u32 split_hash, 
static int ocfs2_dx_dir_rebalance_credits(struct ocfs2_super *osb,

					  struct ocfs2_dx_root_block *dx_root)

{

	int credits = ocfs2_clusters_to_blocks(osb->sb, 2);

	int credits = ocfs2_clusters_to_blocks(osb->sb, 3);



	credits += ocfs2_calc_extend_credits(osb->sb, &dx_root->dr_list);

	credits += ocfs2_quota_trans_credits(osb->sb);

include/asm-generic/sections.h

+3 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * [_sdata, _edata]: contains .data.* sections, may also contain .rodata.*

 *                   and/or .init.* sections.

 * [__start_rodata, __end_rodata]: contains .rodata.* sections

 * [__start_data_ro_after_init, __end_data_ro_after_init]:

 *		     contains data.ro_after_init section

 * [__init_begin, __init_end]: contains .init.* sections, but .init.text.*

 *                   may be out of this range on some architectures.

 * [_sinittext, _einittext]: contains .init.text.* sections
@@ -31,6 +33,7 @@ extern char _data[], _sdata[], _edata[]; 
extern char __bss_start[], __bss_stop[];

extern char __init_begin[], __init_end[];

extern char _sinittext[], _einittext[];

extern char __start_data_ro_after_init[], __end_data_ro_after_init[];

extern char _end[];

extern char __per_cpu_load[], __per_cpu_start[], __per_cpu_end[];

extern char __kprobes_text_start[], __kprobes_text_end[];