Merge branch 'akpm' (patches from Andrew)

Merge fixes from Andrew Morton: "26 fixes" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (26 commits) userfaultfd: remove wrong comment from userfaultfd_ctx_get() fat: fix using uninitialized fields of fat_inode/fsinfo_inode sh: cayman: IDE support fix kasan: fix races in quarantine_remove_cache() kasan: resched in quarantine_remove_cache() mm: do not call mem_cgroup_free() from within mem_cgroup_alloc() thp: fix another corner case of munlock() vs. THPs rmap: fix NULL-pointer dereference on THP munlocking mm/memblock.c: fix memblock_next_valid_pfn() userfaultfd: selftest: vm: allow to build in vm/ directory userfaultfd: non-cooperative: userfaultfd_remove revalidate vma in MADV_DONTNEED userfaultfd: non-cooperative: fix fork fctx->new memleak mm/cgroup: avoid panic when init with low memory drivers/md/bcache/util.h: remove duplicate inclusion of blkdev.h mm/vmstats: add thp_split_pud event for clarity include/linux/fs.h: fix unsigned enum warning with gcc-4.2 userfaultfd: non-cooperative: release all ctx in dup_userfaultfd_complete userfaultfd: non-cooperative: robustness check userfaultfd: non-cooperative: rollback userfaultfd_exit x86, mm: unify exit paths in gup_pte_range() ...

Linus Torvalds committed 9 years ago

Commit 8fe3cca2 parents 9db61d6 2378cd654 files · +277 −185Browse files

Showing the changes to kernel (4 of 54 files). Show all

Unified · Split

4 files

kernel/cgroup/cgroup.c +1 −1
kernel/events/core.c +1 −1
kernel/exit.c +0 −1
kernel/trace/trace_stack.c +1 −1

kernel/cgroup/cgroup.c+1−1

@@ -2669,7 +2669,7 @@ static bool css_visible(struct cgroup_subsys_state *css) · 2668 unmodified lines
2669	2669	*
2670	2670	* Returns 0 on success, -errno on failure. On failure, csses which have
2671	2671	* been processed already aren't cleaned up. The caller is responsible for
2672		− * cleaning up with cgroup_apply_control_disble().
	2672	+ * cleaning up with cgroup_apply_control_disable().
2673	2673	*/
2674	2674	static int cgroup_apply_control_enable(struct cgroup *cgrp)
2675	2675	{

kernel/events/core.c+1−1

@@ -998,7 +998,7 @@ list_update_cgroup_event(struct perf_event *event, · 997 unmodified lines
998	998	*/
999	999	#define PERF_CPU_HRTIMER (1000 / HZ)
1000	1000	/*
1001		− * function must be called with interrupts disbled
	1001	+ * function must be called with interrupts disabled
1002	1002	*/
1003	1003	static enum hrtimer_restart perf_mux_hrtimer_handler(struct hrtimer *hr)
1004	1004	{

kernel/exit.c+0−1

@@ -554,7 +554,6 @@ static void exit_mm(void) · 553 unmodified lines
554	554	enter_lazy_tlb(mm, current);
555	555	task_unlock(current);
556	556	mm_update_next_owner(mm);
557		− userfaultfd_exit(mm);
558	557	mmput(mm);
559	558	if (test_thread_flag(TIF_MEMDIE))
560	559	exit_oom_victim();

kernel/trace/trace_stack.c+1−1

@@ -65,7 +65,7 @@ void stack_trace_print(void) · 64 unmodified lines
65	65	}
66	66
67	67	/*
68		− * When arch-specific code overides this function, the following
	68	+ * When arch-specific code overrides this function, the following
69	69	* data should be filled up, assuming stack_trace_max_lock is held to
70	70	* prevent concurrent updates.
71	71	* stack_trace_index[]