From patchwork Thu Apr 30 23:09:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Keller, Jacob E" X-Patchwork-Id: 466763 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B6FF814075A for ; Fri, 1 May 2015 09:09:48 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 6C73333365; Thu, 30 Apr 2015 23:09:47 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 56iKvesP49Io; Thu, 30 Apr 2015 23:09:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id D24EE2F561; Thu, 30 Apr 2015 23:09:45 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id E5C271C0BF5 for ; Thu, 30 Apr 2015 23:09:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id DCD4291BD2 for ; Thu, 30 Apr 2015 23:09:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rY3NXcVj6fFc for ; Thu, 30 Apr 2015 23:09:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by whitealder.osuosl.org (Postfix) with ESMTP id 9E6FD91BD0 for ; Thu, 30 Apr 2015 23:09:43 +0000 (UTC) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 30 Apr 2015 16:09:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,679,1422950400"; d="scan'208,223";a="721905283" Received: from jekeller-desk.amr.corp.intel.com (HELO jekeller-desk.jekeller.internal) ([134.134.3.151]) by orsmga002.jf.intel.com with ESMTP; 30 Apr 2015 16:09:43 -0700 From: Jacob Keller To: Intel Wired LAN Date: Thu, 30 Apr 2015 16:09:41 -0700 Message-Id: <1430435381-6028-1-git-send-email-jacob.e.keller@intel.com> X-Mailer: git-send-email 2.1.0 MIME-Version: 1.0 Subject: [Intel-wired-lan] [PATCH] i40e: fix LINUX_VERSION's use of EXTRA_CFLAGS X-BeenThere: intel-wired-lan@lists.osuosl.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@lists.osuosl.org Sender: "Intel-wired-lan" In order not to override any CFLAGS_EXTRA from the command line, we create an extra variable EXTRA_CFLAGS which contains our introductino of LINUX_VERSION_CODE, and append CFLAGS_EXTRA to this. However, the i40e driver never did this previously, so it passed CFLAGS_EXTRA directly into the kernel build rule. This patch fixes the issue by using EXTRA_CFLAGS in its place. Without LINUX_VERSION, EXTRA_CFLAGS is equivalent to CFLAGS_EXTRA. Signed-off-by: Jacob Keller Change-type: Build Change Complexity: Low Customer-visible: No --- src/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) From e427bf540ee694678103072b17b17076e94f451b Mon Sep 17 00:00:00 2001 From: Jacob Keller 1430435367 -0700 Date: Thu, 30 Apr 2015 16:06:14 -0700 Subject: [PATCH] i40e: fix LINUX_VERSION's use of EXTRA_CFLAGS In order not to override any CFLAGS_EXTRA from the command line, we create an extra variable EXTRA_CFLAGS which contains our introductino of LINUX_VERSION_CODE, and append CFLAGS_EXTRA to this. However, the i40e driver never did this previously, so it passed CFLAGS_EXTRA directly into the kernel build rule. This patch fixes the issue by using EXTRA_CFLAGS in its place. Without LINUX_VERSION, EXTRA_CFLAGS is equivalent to CFLAGS_EXTRA. Signed-off-by: Jacob Keller Change-type: Build Change Complexity: Low Customer-visible: No --- src/Makefile | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Makefile b/src/Makefile index aee4f91ad4c2..9bb0d4f66bb8 100644 --- a/src/Makefile +++ b/src/Makefile @@ -195,9 +195,9 @@ endif # $2 is the kernel build target kernelbuild = $(shell (\ if [ -n "$(KOBJ)" ]; then \ - $(MAKE) ccflags-y:="$(CFLAGS_EXTRA)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=$(realpath $(1)) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) $(2) ; \ + $(MAKE) ccflags-y:="$(EXTRA_CFLAGS)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=$(realpath $(1)) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) $(2) ; \ else \ - $(MAKE) ccflags-y:="$(CFLAGS_EXTRA)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=$(realpath $(1)) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) $(2) ; \ + $(MAKE) ccflags-y:="$(EXTRA_CFLAGS)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=$(realpath $(1)) INSTALL_MOD_PATH=$(INSTALL_MOD_PATH) $(2) ; \ fi > .tmp ; rm .tmp)) @@ -213,9 +213,9 @@ $(MODULES): $(TARGETS) $(TARGETS): $(SOURCES) @for s in $(DRIVERS) ; do \ if [ -n "$(KOBJ)" ]; then \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s modules ; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s modules ; \ else \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s modules ; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s modules ; \ fi ; \ done @@ -236,18 +236,18 @@ silent: $(SOURCES) sparse: clean $(SOURCES) @for s in $(DRIVERS) ; do \ if [ -n "$(KOBJ)" ]; then \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s C=2 CF="-D__CHECK_ENDIAN__ -Wbitwise -Wcontext" modules ; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s C=2 CF="-D__CHECK_ENDIAN__ -Wbitwise -Wcontext" modules ; \ else \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s C=2 CF="-D__CHECK_ENDIAN_ -Wbitwise -Wcontext" modules ; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s C=2 CF="-D__CHECK_ENDIAN_ -Wbitwise -Wcontext" modules ; \ fi ; \ done ccc: clean $(SOURCES) @for s in $(DRIVERS) ; do \ if [ -n "$(KOBJ)" ]; then \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s coccicheck MODE=report; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s coccicheck MODE=report; \ else \ - $(MAKE) ccflags-y+="$(CFLAGS_EXTRA)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s coccicheck MODE=report; \ + $(MAKE) ccflags-y+="$(EXTRA_CFLAGS)" -C $(KSRC) -O $(KOBJ) CONFIG_I40E=m CONFIG_I40EVF=m SUBDIRS=`pwd`/$$s coccicheck MODE=report; \ fi ; \ done -- 2.1.0