• Michal Hocko's avatar
    mm, vmalloc: fix vmalloc users tracking properly · 8594a21c
    Michal Hocko authored
    Commit 1f5307b1 ("mm, vmalloc: properly track vmalloc users") has
    pulled asm/pgtable.h include dependency to linux/vmalloc.h and that
    turned out to be a bad idea for some architectures.  E.g.  m68k fails
    with
    
       In file included from arch/m68k/include/asm/pgtable_mm.h:145:0,
                        from arch/m68k/include/asm/pgtable.h:4,
                        from include/linux/vmalloc.h:9,
                        from arch/m68k/kernel/module.c:9:
       arch/m68k/include/asm/mcf_pgtable.h: In function 'nocache_page':
    >> arch/m68k/include/asm/mcf_pgtable.h:339:43: error: 'init_mm' undeclared (first use in this function)
        #define pgd_offset_k(address) pgd_offset(&init_mm, address)
    
    as spotted by kernel build bot. nios2 fails for other reason
    
      In file included from include/asm-generic/io.h:767:0,
                       from arch/nios2/include/asm/io.h:61,
                       from include/linux/io.h:25,
                       from arch/nios2/include/asm/pgtable.h:18,
                       from include/linux/mm.h:70,
                       from include/linux/pid_namespace.h:6,
                       from include/linux/ptrace.h:9,
                       from arch/nios2/include/uapi/asm/elf.h:23,
                       from arch/nios2/include/asm/elf.h:22,
                       from include/linux/elf.h:4,
                       from include/linux/module.h:15,
                       from init/main.c:16:
      include/linux/vmalloc.h: In function '__vmalloc_node_flags':
      include/linux/vmalloc.h:99:40: error: 'PAGE_KERNEL' undeclared (first use in this function); did you mean 'GFP_KERNEL'?
    
    which is due to the newly added #include <asm/pgtable.h>, which on nios2
    includes <linux/io.h> and thus <asm/io.h> and <asm-generic/io.h> which
    again includes <linux/vmalloc.h>.
    
    Tweaking that around just turns out a bigger headache than necessary.
    This patch reverts 1f5307b1 and reimplements the original fix in a
    different way.  __vmalloc_node_flags can stay static inline which will
    cover vmalloc* functions.  We only have one external user
    (kvmalloc_node) and we can export __vmalloc_node_flags_caller and
    provide the caller directly.  This is much simpler and it doesn't really
    need any games with header files.
    
    [akpm@linux-foundation.org: coding-style fixes]
    [mhocko@kernel.org: revert old comment]
      Link: http://lkml.kernel.org/r/20170509211054.GB16325@dhcp22.suse.cz
    Fixes: 1f5307b1 ("mm, vmalloc: properly track vmalloc users")
    Link: http://lkml.kernel.org/r/20170509153702.GR6481@dhcp22.suse.cz
    
    Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
    Cc: Tobias Klauser <tklauser@distanz.ch>
    Cc: Geert Uytterhoeven <geert@linux-m68k.org>
    Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
    Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
    8594a21c
util.c 17.9 KB