From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752973AbeCaIox (ORCPT ); Sat, 31 Mar 2018 04:44:53 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:36541 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752396AbeCaIov (ORCPT ); Sat, 31 Mar 2018 04:44:51 -0400 X-Google-Smtp-Source: AIpwx4/zHRAbTG5GpzhIJNqW5We69/3Z9BpoGkKTfDNcgM7fQHvFskuvkFVQ1TwqgPy+br+iPUVzCw== Date: Sat, 31 Mar 2018 10:44:47 +0200 From: Ingo Molnar To: yamada.masahiro@socionext.com, tglx@linutronix.de, michal.lkml@markovi.net, linux-kernel@vger.kernel.org, hpa@zytor.com, torvalds@linux-foundation.org, peterz@infradead.org, caoj.fnst@cn.fujitsu.com Cc: linux-tip-commits@vger.kernel.org Subject: Re: [tip:x86/build] x86/build: Don't pass in -D__KERNEL__ multiple times Message-ID: <20180331084447.s7diqmbdbs2zmqdm@gmail.com> References: <20180316084944.3997-1-caoj.fnst@cn.fujitsu.com> <20180331083816.mwa4jo7xmuch2vze@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180331083816.mwa4jo7xmuch2vze@gmail.com> User-Agent: NeoMutt/20170609 (1.8.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Ingo Molnar wrote: > > * tip-bot for Cao jin wrote: > > > Commit-ID: d6289f36aa7d5893d091a7a0c67eee7798719f03 > > Gitweb: https://git.kernel.org/tip/d6289f36aa7d5893d091a7a0c67eee7798719f03 > > Author: Cao jin > > AuthorDate: Fri, 16 Mar 2018 16:49:44 +0800 > > Committer: Ingo Molnar > > CommitDate: Sat, 31 Mar 2018 08:02:07 +0200 > > > > x86/build: Don't pass in -D__KERNEL__ multiple times > > > > Some ..cmd files under arch/x86 are showing two instances of > > -D__KERNEL__, like arch/x86/boot/ and arch/x86/realmode/rm/. > > > > __KERNEL__ is already defined in KBUILD_CPPFLAGS in the top Makefile, > > so it can be dropped safely. > > > > Signed-off-by: Cao jin > > Cc: H. Peter Anvin > > Cc: Linus Torvalds > > Cc: Masahiro Yamada > > Cc: Michal Marek > > Cc: Peter Zijlstra > > Cc: Thomas Gleixner > > Cc: linux-kbuild@vger.kernel.org > > Link: http://lkml.kernel.org/r/20180316084944.3997-1-caoj.fnst@cn.fujitsu.com > > Signed-off-by: Ingo Molnar > > --- > > arch/x86/Makefile | 3 +-- > > arch/x86/boot/compressed/Makefile | 2 +- > > 2 files changed, 2 insertions(+), 3 deletions(-) > > > > diff --git a/arch/x86/Makefile b/arch/x86/Makefile > > index d798e36d103c..a517852dad55 100644 > > --- a/arch/x86/Makefile > > +++ b/arch/x86/Makefile > > @@ -31,8 +31,7 @@ endif > > CODE16GCC_CFLAGS := -m32 -Wa,$(srctree)/arch/x86/boot/code16gcc.h > > M16_CFLAGS := $(call cc-option, -m16, $(CODE16GCC_CFLAGS)) > > > > -REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -D__KERNEL__ \ > > - -DDISABLE_BRANCH_PROFILING \ > > +REALMODE_CFLAGS := $(M16_CFLAGS) -g -Os -DDISABLE_BRANCH_PROFILING \ > > -Wall -Wstrict-prototypes -march=i386 -mregparm=3 \ > > -fno-strict-aliasing -fomit-frame-pointer -fno-pic \ > > -mno-mmx -mno-sse > > diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile > > index f25e1530e064..f484ae0ece93 100644 > > --- a/arch/x86/boot/compressed/Makefile > > +++ b/arch/x86/boot/compressed/Makefile > > @@ -26,7 +26,7 @@ KCOV_INSTRUMENT := n > > targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma \ > > vmlinux.bin.xz vmlinux.bin.lzo vmlinux.bin.lz4 > > > > -KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ -O2 > > +KBUILD_CFLAGS := -m$(BITS) -O2 > > KBUILD_CFLAGS += -fno-strict-aliasing $(call cc-option, -fPIE, -fPIC) > > KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING > > cflags-$(CONFIG_X86_32) := -march=i386 > > Dropped this patch, it's totally untested, the build fails on x86-64 defconfig > already. Apologies, I messed up my testing: the patch is fine after all! Thanks, Ingo