From patchwork Fri Oct 10 05:14:26 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 3685 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 5B895DDEF0 for ; Fri, 10 Oct 2008 16:14:55 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800AbYJJFOu (ORCPT ); Fri, 10 Oct 2008 01:14:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751582AbYJJFOu (ORCPT ); Fri, 10 Oct 2008 01:14:50 -0400 Received: from 74-93-104-97-Washington.hfc.comcastbusiness.net ([74.93.104.97]:36688 "EHLO sunset.davemloft.net" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751317AbYJJFOu (ORCPT ); Fri, 10 Oct 2008 01:14:50 -0400 Received: from localhost (localhost [127.0.0.1]) by sunset.davemloft.net (Postfix) with ESMTP id 3685EC8C192; Thu, 9 Oct 2008 22:14:26 -0700 (PDT) Date: Thu, 09 Oct 2008 22:14:26 -0700 (PDT) Message-Id: <20081009.221426.120533568.davem@davemloft.net> To: akpm@linux-foundation.org Cc: mingo@elte.hu, netdev@vger.kernel.org Subject: Re: drivers/net/enic/vnic_cq.c From: David Miller In-Reply-To: <20081009.220513.181546765.davem@davemloft.net> References: <20081009212755.94fe11f6.akpm@linux-foundation.org> <20081009.215452.193703022.davem@davemloft.net> <20081009.220513.181546765.davem@davemloft.net> X-Mailer: Mew version 6.1 on Emacs 22.1 / Mule 5.0 (SAKAKI) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org I just pushed the following into net-next-2.6: enic: Attempt to fix build in 32-bit such as i386. Such platforms lack readq/writeq but this driver want to call them. Noticed by Andrew Morton. Signed-off-by: David S. Miller --- drivers/net/enic/vnic_dev.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/net/enic/vnic_dev.h b/drivers/net/enic/vnic_dev.h index 2dcffd3..b9dc182 100644 --- a/drivers/net/enic/vnic_dev.h +++ b/drivers/net/enic/vnic_dev.h @@ -27,6 +27,20 @@ #define VNIC_PADDR_TARGET 0x0000000000000000ULL #endif +#ifndef readq +static inline u64 readq(void __iomem *reg) +{ + return (((u64)readl(reg + 0x4UL) << 32) | + (u64)readl(reg)); +} + +static inline void writeq(u64 val, void __iomem *reg) +{ + writel(val & 0xffffffff, reg); + writel(val >> 32, reg + 0x4UL); +} +#endif + enum vnic_dev_intr_mode { VNIC_DEV_INTR_MODE_UNKNOWN, VNIC_DEV_INTR_MODE_INTX,