diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-07 01:15:42 -0500 |
| commit | a2e5790d841658485d642196dbb0927303d6c22f (patch) | |
| tree | b3d28c9bcb7da6880806146fd22a88a7ee7f733e /mm/memory.c | |
| parent | ab2d92ad881da11331280aedf612d82e61cb6d41 (diff) | |
| parent | 60c3e026d73ccabb075fb70ba02f8512ab40cf2c (diff) | |
Merge branch 'akpm' (patches from Andrew)
Merge misc updates from Andrew Morton:
- kasan updates
- procfs
- lib/bitmap updates
- other lib/ updates
- checkpatch tweaks
- rapidio
- ubsan
- pipe fixes and cleanups
- lots of other misc bits
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (114 commits)
Documentation/sysctl/user.txt: fix typo
MAINTAINERS: update ARM/QUALCOMM SUPPORT patterns
MAINTAINERS: update various PALM patterns
MAINTAINERS: update "ARM/OXNAS platform support" patterns
MAINTAINERS: update Cortina/Gemini patterns
MAINTAINERS: remove ARM/CLKDEV SUPPORT file pattern
MAINTAINERS: remove ANDROID ION pattern
mm: docs: add blank lines to silence sphinx "Unexpected indentation" errors
mm: docs: fix parameter names mismatch
mm: docs: fixup punctuation
pipe: read buffer limits atomically
pipe: simplify round_pipe_size()
pipe: reject F_SETPIPE_SZ with size over UINT_MAX
pipe: fix off-by-one error when checking buffer limits
pipe: actually allow root to exceed the pipe buffer limits
pipe, sysctl: remove pipe_proc_fn()
pipe, sysctl: drop 'min' parameter from pipe-max-size converter
kasan: rework Kconfig settings
crash_dump: is_kdump_kernel can be boolean
kernel/mutex: mutex_is_locked can be boolean
...
Diffstat (limited to 'mm/memory.c')
| -rw-r--r-- | mm/memory.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/mm/memory.c b/mm/memory.c index 2248529e71c1..dd8de96f5547 100644 --- a/mm/memory.c +++ b/mm/memory.c | |||
| @@ -59,7 +59,6 @@ | |||
| 59 | #include <linux/writeback.h> | 59 | #include <linux/writeback.h> |
| 60 | #include <linux/memcontrol.h> | 60 | #include <linux/memcontrol.h> |
| 61 | #include <linux/mmu_notifier.h> | 61 | #include <linux/mmu_notifier.h> |
| 62 | #include <linux/kallsyms.h> | ||
| 63 | #include <linux/swapops.h> | 62 | #include <linux/swapops.h> |
| 64 | #include <linux/elf.h> | 63 | #include <linux/elf.h> |
| 65 | #include <linux/gfp.h> | 64 | #include <linux/gfp.h> |
| @@ -767,9 +766,6 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, | |||
| 767 | dump_page(page, "bad pte"); | 766 | dump_page(page, "bad pte"); |
| 768 | pr_alert("addr:%p vm_flags:%08lx anon_vma:%p mapping:%p index:%lx\n", | 767 | pr_alert("addr:%p vm_flags:%08lx anon_vma:%p mapping:%p index:%lx\n", |
| 769 | (void *)addr, vma->vm_flags, vma->anon_vma, mapping, index); | 768 | (void *)addr, vma->vm_flags, vma->anon_vma, mapping, index); |
| 770 | /* | ||
| 771 | * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y | ||
| 772 | */ | ||
| 773 | pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n", | 769 | pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n", |
| 774 | vma->vm_file, | 770 | vma->vm_file, |
| 775 | vma->vm_ops ? vma->vm_ops->fault : NULL, | 771 | vma->vm_ops ? vma->vm_ops->fault : NULL, |