From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752266AbdEJJha (ORCPT ); Wed, 10 May 2017 05:37:30 -0400 Received: from mail-io0-f194.google.com ([209.85.223.194]:33608 "EHLO mail-io0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751724AbdEJJh2 (ORCPT ); Wed, 10 May 2017 05:37:28 -0400 MIME-Version: 1.0 In-Reply-To: <20170509153702.GR6481@dhcp22.suse.cz> References: <20170509144108.31910-1-mhocko@kernel.org> <20170509153702.GR6481@dhcp22.suse.cz> From: Geert Uytterhoeven Date: Wed, 10 May 2017 11:37:26 +0200 X-Google-Sender-Auth: -MxFT3yVwJZNDfE3KgvBvHkHzhA Message-ID: Subject: Re: [PATCH] mm, vmalloc: fix vmalloc users tracking properly To: Michal Hocko Cc: Linus Torvalds , Andrew Morton , Tobias Klauser , Linux MM , LKML Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, May 9, 2017 at 5:37 PM, Michal Hocko wrote: > Sigh. I've apparently managed to screw up again. This should address the > nommu breakage reported by 0-day. > --- > From 95d49bf93ae4467f3f918520ec03b3596e5b36cc Mon Sep 17 00:00:00 2001 > From: Michal Hocko > Date: Tue, 9 May 2017 16:27:39 +0200 > Subject: [PATCH] mm, vmalloc: fix vmalloc users tracking properly > > 1f5307b1e094 ("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 , which on nios2 > includes and thus and which > again includes . > > Tweaking that around just turns out a bigger headache than > necessary. This patch reverts 1f5307b1e094 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. > > Fixes: 1f5307b1e094 ("mm, vmalloc: properly track vmalloc users") > Signed-off-by: Michal Hocko Tested-by: Geert Uytterhoeven Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds