Merge tag 'nfs-for-4.16-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[linux-2.6-block.git] / mm / memory.c

diff --git a/mm/memory.c b/mm/memory.c
index 2248529e71c11218b1d008d3c0b40f9d6df61370..dd8de96f55475c8de7edae699dd10d0adb8c4fb6 100644 (file)
--- 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,