From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 11 Jun 2020 20:25:53 +0000 (-0700)
Subject: Merge branch 'akpm' (patches from Andrew)
X-Git-Tag: baikal/aarch64/sdk6.1~9088
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=86eeb76b5634d1acf06eed3df0d3e28689891b29;p=kernel.git

Merge branch 'akpm' (patches from Andrew)

Merge some more updates from Andrew Morton:

 - various hotfixes and minor things

 - hch's use_mm/unuse_mm clearnups

Subsystems affected by this patch series: mm/hugetlb, scripts, kcov,
lib, nilfs, checkpatch, lib, mm/debug, ocfs2, lib, misc.

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kernel: set USER_DS in kthread_use_mm
  kernel: better document the use_mm/unuse_mm API contract
  kernel: move use_mm/unuse_mm to kthread.c
  kernel: move use_mm/unuse_mm to kthread.c
  stacktrace: cleanup inconsistent variable type
  lib: test get_count_order/long in test_bitops.c
  mm: add comments on pglist_data zones
  ocfs2: fix spelling mistake and grammar
  mm/debug_vm_pgtable: fix kernel crash by checking for THP support
  lib: fix bitmap_parse() on 64-bit big endian archs
  checkpatch: correct check for kernel parameters doc
  nilfs2: fix null pointer dereference at nilfs_segctor_do_construct()
  lib/lz4/lz4_decompress.c: document deliberate use of `&'
  kcov: check kcov_softirq in kcov_remote_stop()
  scripts/spelling: add a few more typos
  khugepaged: selftests: fix timeout condition in wait_for_scan()
---

86eeb76b5634d1acf06eed3df0d3e28689891b29
diff --cc kernel/kthread.c
index b84fc7eec0358,86357cd38eb20..8e3d2d7fdf5e2
--- a/kernel/kthread.c
+++ b/kernel/kthread.c
@@@ -46,8 -51,8 +51,9 @@@ struct kthread_create_inf
  struct kthread {
  	unsigned long flags;
  	unsigned int cpu;
 +	int (*threadfn)(void *);
  	void *data;
+ 	mm_segment_t oldfs;
  	struct completion parked;
  	struct completion exited;
  #ifdef CONFIG_BLK_CGROUP