Commit b7cbaf59 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge misc fixes from Andrew Morton:
 "Subsystems affected by this patch series: mm (memremap, memcg,
  slab-generic, kasan, mempolicy, pagecache, oom-kill, pagemap),
  kthread, signals, lib, epoll, and core-kernel"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  kernel/hung_task.c: make type annotations consistent
  epoll: add a selftest for epoll timeout race
  mm: always have io_remap_pfn_range() set pgprot_decrypted()
  mm, oom: keep oom_adj under or at upper limit when printing
  kthread_worker: prevent queuing delayed work from timer_fn when it is being canceled
  mm/truncate.c: make __invalidate_mapping_pages() static
  lib/crc32test: remove extra local_irq_disable/enable
  ptrace: fix task_join_group_stop() for the case when current is traced
  mm: mempolicy: fix potential pte_unmap_unlock pte error
  kasan: adopt KUNIT tests to SW_TAGS mode
  mm: memcg: link page counters to root if use_hierarchy is false
  mm: memcontrol: correct the NR_ANON_THPS counter of hierarchical memcg
  hugetlb_cgroup: fix reservation accounting
  mm/mremap_pages: fix static key devmap_managed_key updates
parents 495023e4 3b70ae4f

fs/proc/base.c

+2 −0
Original line number Diff line number Diff line
@@ -1049,6 +1049,8 @@ static ssize_t oom_adj_read(struct file *file, char __user *buf, size_t count, 
		oom_adj = (task->signal->oom_score_adj * -OOM_DISABLE) /

			  OOM_SCORE_ADJ_MAX;

	put_task_struct(task);

	if (oom_adj > OOM_ADJUST_MAX)

		oom_adj = OOM_ADJUST_MAX;

	len = snprintf(buffer, sizeof(buffer), "%d\n", oom_adj);

	return simple_read_from_buffer(buf, count, ppos, buffer, len);

}

include/linux/mm.h

+9 −0
Original line number Diff line number Diff line
@@ -2759,6 +2759,15 @@ static inline vm_fault_t vmf_insert_page(struct vm_area_struct *vma, 
	return VM_FAULT_NOPAGE;

}



#ifndef io_remap_pfn_range

static inline int io_remap_pfn_range(struct vm_area_struct *vma,

				     unsigned long addr, unsigned long pfn,

				     unsigned long size, pgprot_t prot)

{

	return remap_pfn_range(vma, addr, pfn, size, pgprot_decrypted(prot));

}

#endif



static inline vm_fault_t vmf_error(int err)

{

	if (err == -ENOMEM)

include/linux/pgtable.h

+0 −4
Original line number Diff line number Diff line
@@ -1427,10 +1427,6 @@ typedef unsigned int pgtbl_mod_mask; 


#endif /* !__ASSEMBLY__ */



#ifndef io_remap_pfn_range

#define io_remap_pfn_range remap_pfn_range

#endif



#ifndef has_transparent_hugepage

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

#define has_transparent_hugepage() 1

kernel/hung_task.c

+1 −2
Original line number Diff line number Diff line
@@ -225,8 +225,7 @@ static long hung_timeout_jiffies(unsigned long last_checked, 
 * Process updating of timeout sysctl

 */

int proc_dohung_task_timeout_secs(struct ctl_table *table, int write,

				  void __user *buffer,

				  size_t *lenp, loff_t *ppos)

				  void *buffer, size_t *lenp, loff_t *ppos)

{

	int ret;

kernel/kthread.c

+2 −1
Original line number Diff line number Diff line
@@ -897,6 +897,7 @@ void kthread_delayed_work_timer_fn(struct timer_list *t) 
	/* Move the work from worker->delayed_work_list. */

	WARN_ON_ONCE(list_empty(&work->node));

	list_del_init(&work->node);

	if (!work->canceling)

		kthread_insert_work(worker, work, &worker->work_list);



	raw_spin_unlock_irqrestore(&worker->lock, flags);

CRA Git | Maintained and supported by SUSTech CRA and CCSE