diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 14:44:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-08-21 14:44:48 -0700 |
| commit | 349111f050b54648df9b3e3d70944c56108c6470 (patch) | |
| tree | 5204ec32d8a1099b22efe1354106efbe640ffa35 /mm/rodata_test.c | |
| parent | f22c5579a7d600fa03f8c1d150cf78188f8709b6 (diff) | |
| parent | 88e8ac11d2ea3acc003cf01bb5a38c8aa76c3cfd (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"11 patches.
Subsystems affected by this: misc, mm/hugetlb, mm/vmalloc, mm/misc,
romfs, relay, uprobes, squashfs, mm/cma, mm/pagealloc"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
mm, page_alloc: fix core hung in free_pcppages_bulk()
mm: include CMA pages in lowmem_reserve at boot
squashfs: avoid bio_alloc() failure with 1Mbyte blocks
uprobes: __replace_page() avoid BUG in munlock_vma_page()
kernel/relay.c: fix memleak on destroy relay channel
romfs: fix uninitialized memory leak in romfs_dev_read()
mm/rodata_test.c: fix missing function declaration
mm/vunmap: add cond_resched() in vunmap_pmd_range
khugepaged: adjust VM_BUG_ON_MM() in __khugepaged_enter()
hugetlb_cgroup: convert comma to semicolon
mailmap: add Andi Kleen
Diffstat (limited to 'mm/rodata_test.c')
| -rw-r--r-- | mm/rodata_test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mm/rodata_test.c b/mm/rodata_test.c index 2a99df7beeb3..2613371945b7 100644 --- a/mm/rodata_test.c +++ b/mm/rodata_test.c @@ -7,6 +7,7 @@ */ #define pr_fmt(fmt) "rodata_test: " fmt +#include <linux/rodata_test.h> #include <linux/uaccess.h> #include <asm/sections.h> |