From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755319AbbI1Gj2 (ORCPT ); Mon, 28 Sep 2015 02:39:28 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:35451 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750843AbbI1Gj1 (ORCPT ); Mon, 28 Sep 2015 02:39:27 -0400 From: Rasmus Villemoes To: kbuild test robot , Benjamin Herrenschmidt , Michael Ellerman Cc: kbuild-all@01.org, Thomas Gleixner , Oleg Nesterov , "Paul E. McKenney" , Rusty Russell , Greg Kroah-Hartman , "K. Y. Srinivasan" , "Peter Zijlstra \(Intel\)" , Vitaly Kuznetsov , Mathias Krause , linux-kernel@vger.kernel.org Subject: Re: [PATCH 4/5] kernel/cpu.c: eliminate cpu_*_mask Organization: D03 References: <1443205347-13634-5-git-send-email-linux@rasmusvillemoes.dk> <201509281303.5hjLVTJZ%fengguang.wu@intel.com> X-Hashcash: 1:20:150928:kys@microsoft.com::UHvk9m6K/wUX4zfC:000000000000000000000000000000000000000000000Z5e X-Hashcash: 1:20:150928:gregkh@linuxfoundation.org::Dm6YhdOJYPz3956f:000000000000000000000000000000000000M3n X-Hashcash: 1:20:150928:tglx@linutronix.de::m/4GwFaesyvUJ9kB:000000000000000000000000000000000000000000008Dw X-Hashcash: 1:20:150928:peterz@infradead.org::4vA7D7ObhUznma9m:000000000000000000000000000000000000000000ezF X-Hashcash: 1:20:150928:oleg@redhat.com::FRYSTAPxP24Yqf1j:001EpH X-Hashcash: 1:20:150928:linux-kernel@vger.kernel.org::j2X57du4uFsepZl8:0000000000000000000000000000000000owZ X-Hashcash: 1:20:150928:rusty@rustcorp.com.au::naiUE63J30kCoDNr:00000000000000000000000000000000000000002L8q X-Hashcash: 1:20:150928:kbuild-all@01.org::xaQ2pY0geBd2BexN:000000000000000000000000000000000000000000003SOd X-Hashcash: 1:20:150928:paulmck@linux.vnet.ibm.com::wj5iPzvXV5rG5KA9:0000000000000000000000000000000000042mI X-Hashcash: 1:20:150928:vkuznets@redhat.com::sgVFFoNqOiqhlFR5:000000000000000000000000000000000000000000832+ X-Hashcash: 1:20:150928:minipli@googlemail.com::i+qsgkJ1/sbJXuk9:0000000000000000000000000000000000000008EFc X-Hashcash: 1:20:150928:lkp@intel.com::Gp1jgCNKAKpnjtzt:0000AusW Date: Mon, 28 Sep 2015 08:39:23 +0200 In-Reply-To: <201509281303.5hjLVTJZ%fengguang.wu@intel.com> (kbuild test robot's message of "Mon, 28 Sep 2015 14:02:03 +0800") Message-ID: <87oagnf3ok.fsf@rasmusvillemoes.dk> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 28 2015, kbuild test robot wrote: > Hi Rasmus, > > [auto build test results on v4.3-rc2 -- if it's inappropriate base, please ignore] > > config: powerpc-allyesconfig (attached as .config) > reproduce: > wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross > chmod +x ~/bin/make.cross > git checkout c14fd9e74ebf7540e312ff440343f9843917ec66 > # save the attached .config to linux build tree > make.cross ARCH=powerpc > > All error/warnings (new ones prefixed by >>): > > In file included from include/linux/rcupdate.h:40:0, > from include/linux/idr.h:18, > from include/linux/kernfs.h:14, > from include/linux/sysfs.h:15, > from include/linux/kobject.h:21, > from include/linux/pci.h:28, > from arch/powerpc/kernel/prom.c:25: >>> include/linux/cpumask.h:93:29: error: expected identifier or '(' before 'const' > #define cpu_online_mask ((const struct cpumask *)&__cpu_online_mask) > ^ Gah, I didn't check for struct members called cpu_online_mask :( PPC people: The issue is that I changed cpu_online_mask (and friends) from being "const struct cpumask *const" exported variables to macros with the same type and value (after exporting what they pointed to). But that conflicts with that identifier used in struct fadump_crash_info_header. Would you be ok with renaming that member to just "online_mask"? I think it would be Subject: [PATCH] ppc: rename cpu_online_mask member of struct fadump_crash_info_header As preparation for eliminating the indirect access to the various global cpu_xyz_bits bitmaps via the pointer variables cpu_xyz_mask, rename the cpu_online_mask of struct fadump_crash_info_header to simply online_mask, to allow cpu_online_mask to become a macro. Signed-off-by: Rasmus Villemoes --- arch/powerpc/include/asm/fadump.h | 2 +- arch/powerpc/kernel/fadump.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/fadump.h b/arch/powerpc/include/asm/fadump.h index 493e72f64b35..b4407d0add27 100644 --- a/arch/powerpc/include/asm/fadump.h +++ b/arch/powerpc/include/asm/fadump.h @@ -191,7 +191,7 @@ struct fadump_crash_info_header { u64 elfcorehdr_addr; u32 crashing_cpu; struct pt_regs regs; - struct cpumask cpu_online_mask; + struct cpumask online_mask; }; /* Crash memory ranges */ diff --git a/arch/powerpc/kernel/fadump.c b/arch/powerpc/kernel/fadump.c index 26d091a1a54c..3cb3b02a13dd 100644 --- a/arch/powerpc/kernel/fadump.c +++ b/arch/powerpc/kernel/fadump.c @@ -415,7 +415,7 @@ void crash_fadump(struct pt_regs *regs, const char *str) else ppc_save_regs(&fdh->regs); - fdh->cpu_online_mask = *cpu_online_mask; + fdh->online_mask = *cpu_online_mask; /* Call ibm,os-term rtas call to trigger firmware assisted dump */ rtas_os_term((char *)str); @@ -646,7 +646,7 @@ static int __init fadump_build_cpu_notes(const struct fadump_mem_struct *fdm) } /* Lower 4 bytes of reg_value contains logical cpu id */ cpu = be64_to_cpu(reg_entry->reg_value) & FADUMP_CPU_ID_MASK; - if (fdh && !cpumask_test_cpu(cpu, &fdh->cpu_online_mask)) { + if (fdh && !cpumask_test_cpu(cpu, &fdh->online_mask)) { SKIP_TO_NEXT_CPU(reg_entry); continue; } -- 2.1.3