Patchwork [PATCH-next] intel ethernet: fix s390 build failure due to implicit prefetch.h

login
register
mail settings
Submitter Paul Gortmaker
Date Jan. 10, 2014, 7:28 p.m.
Message ID <1389382096-17122-1-git-send-email-paul.gortmaker@windriver.com>
Download mbox | patch
Permalink /patch/309373/
State Awaiting Upstream
Delegated to: David Miller
Headers show

Comments

Paul Gortmaker - Jan. 10, 2014, 7:28 p.m.
As of commit 7f12ad741a4870b8b6e3aafbcd868d0191770802 ("i40evf: transmit
and receive functionality") the s390 builds (allyesconfig) fail with:

drivers/net/ethernet/intel/i40evf/i40e_txrx.c: In function 'i40e_clean_rx_irq':
drivers/net/ethernet/intel/i40evf/i40e_txrx.c:818:3: error: implicit declaration of function 'prefetch'
make[5]: *** [drivers/net/ethernet/intel/i40evf/i40e_txrx.o] Error 1

due to an implicit assumption that the prototype from linux/prefetch.h
will be present.

Cc: Mitch Williams <mitch.a.williams@intel.com>
Cc: Greg Rose <gregory.v.rose@intel.com>
Cc: Sibai Li <sibai.li@intel.com>
Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
David Miller - Jan. 10, 2014, 7:52 p.m.
From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Fri, 10 Jan 2014 14:28:16 -0500

> As of commit 7f12ad741a4870b8b6e3aafbcd868d0191770802 ("i40evf: transmit
> and receive functionality") the s390 builds (allyesconfig) fail with:
> 
> drivers/net/ethernet/intel/i40evf/i40e_txrx.c: In function 'i40e_clean_rx_irq':
> drivers/net/ethernet/intel/i40evf/i40e_txrx.c:818:3: error: implicit declaration of function 'prefetch'
> make[5]: *** [drivers/net/ethernet/intel/i40evf/i40e_txrx.o] Error 1
> 
> due to an implicit assumption that the prototype from linux/prefetch.h
> will be present.
> 
> Cc: Mitch Williams <mitch.a.williams@intel.com>
> Cc: Greg Rose <gregory.v.rose@intel.com>
> Cc: Sibai Li <sibai.li@intel.com>
> Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

I hope the Intel folks will pick this up quickly and push it to me.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Jeff Kirsher - Jan. 10, 2014, 7:56 p.m.
On Fri, 2014-01-10 at 14:52 -0500, David Miller wrote:
> From: Paul Gortmaker <paul.gortmaker@windriver.com>
> Date: Fri, 10 Jan 2014 14:28:16 -0500
> 
> > As of commit 7f12ad741a4870b8b6e3aafbcd868d0191770802 ("i40evf: transmit
> > and receive functionality") the s390 builds (allyesconfig) fail with:
> > 
> > drivers/net/ethernet/intel/i40evf/i40e_txrx.c: In function 'i40e_clean_rx_irq':
> > drivers/net/ethernet/intel/i40evf/i40e_txrx.c:818:3: error: implicit declaration of function 'prefetch'
> > make[5]: *** [drivers/net/ethernet/intel/i40evf/i40e_txrx.o] Error 1
> > 
> > due to an implicit assumption that the prototype from linux/prefetch.h
> > will be present.
> > 
> > Cc: Mitch Williams <mitch.a.williams@intel.com>
> > Cc: Greg Rose <gregory.v.rose@intel.com>
> > Cc: Sibai Li <sibai.li@intel.com>
> > Cc: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> I hope the Intel folks will pick this up quickly and push it to me.

Yep, Aaron has it in the queue and it is being reviewed and tested
currently.

Patch

diff --git a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
index 8f2b3b2..ffdb01d 100644
--- a/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
+++ b/drivers/net/ethernet/intel/i40evf/i40e_txrx.c
@@ -21,6 +21,8 @@ 
  *
  ******************************************************************************/
 
+#include <linux/prefetch.h>
+
 #include "i40evf.h"
 
 static inline __le64 build_ctob(u32 td_cmd, u32 td_offset, unsigned int size,