diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 06:32:40 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-05-27 06:32:40 +0200 |
| commit | e12fab28df1d7ae9369839a3af260a41447a5e79 (patch) | |
| tree | 2f638674612075002fb6cc5ad1201c701fe4c741 /kernel | |
| parent | Merge tag 'dax-locking-for-4.7' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4 (diff) | |
| download | linux-e12fab28df1d7ae9369839a3af260a41447a5e79.tar.xz linux-e12fab28df1d7ae9369839a3af260a41447a5e79.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge fixes from Andrew Morton:
"10 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
drivers/pinctrl/intel/pinctrl-baytrail.c: fix build with gcc-4.4
update "mm/zsmalloc: don't fail if can't create debugfs info"
dma-debug: avoid spinlock recursion when disabling dma-debug
mm: oom_reaper: remove some bloat
memcg: fix mem_cgroup_out_of_memory() return value.
ocfs2: fix improper handling of return errno
mm: slub: remove unused virt_to_obj()
mm: kasan: remove unused 'reserved' field from struct kasan_alloc_meta
mm: make CONFIG_DEFERRED_STRUCT_PAGE_INIT depends on !FLATMEM explicitly
seqlock: fix raw_read_seqcount_latch()
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fork.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 47887bba944f..5c2c355aa97f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -736,6 +736,7 @@ void mmput(struct mm_struct *mm) } EXPORT_SYMBOL_GPL(mmput); +#ifdef CONFIG_MMU static void mmput_async_fn(struct work_struct *work) { struct mm_struct *mm = container_of(work, struct mm_struct, async_put_work); @@ -749,6 +750,7 @@ void mmput_async(struct mm_struct *mm) schedule_work(&mm->async_put_work); } } +#endif /** * set_mm_exe_file - change a reference to the mm's executable file |