diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-01-04 15:18:21 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-01-04 15:18:21 +1100 |
commit | 477f0c55550f71136dc7f3327812f16bb307af20 (patch) | |
tree | d5b141d5c8510ffedaed3e959d6c46c39620e0a6 /mm/memory.c | |
parent | 44ba66816e4cf8b2895de352fe7772cce4a7de03 (diff) | |
parent | c7eba70e5db0cfd42a0e9d6b06a8a481339491d5 (diff) | |
download | linux-next-477f0c55550f71136dc7f3327812f16bb307af20.tar.gz |
Merge branch 'akpm/master'
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 69b283b9ecc5..36dd3a66aa5a 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -59,7 +59,6 @@ #include <linux/writeback.h> #include <linux/memcontrol.h> #include <linux/mmu_notifier.h> -#include <linux/kallsyms.h> #include <linux/swapops.h> #include <linux/elf.h> #include <linux/gfp.h> @@ -767,9 +766,6 @@ static void print_bad_pte(struct vm_area_struct *vma, unsigned long addr, dump_page(page, "bad pte"); pr_alert("addr:%p vm_flags:%08lx anon_vma:%p mapping:%p index:%lx\n", (void *)addr, vma->vm_flags, vma->anon_vma, mapping, index); - /* - * Choose text because data symbols depend on CONFIG_KALLSYMS_ALL=y - */ pr_alert("file:%pD fault:%pf mmap:%pf readpage:%pf\n", vma->vm_file, vma->vm_ops ? vma->vm_ops->fault : NULL, |