diff mbox

mlx4: Fix compile error when driver is comiled-in

Message ID 20111215164837.GE2112@amd.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Joerg Roedel Dec. 15, 2011, 4:48 p.m. UTC 
Hi,

Testing my iommu-configs against linux-next found a compile error for
allyesconfig. It only happens when the mlx4 driver is compiled into the
kernel and not as a module because these two static functions are also
used in another file. The attached patch fixes it.

From b993c4448c2ce5447fd24e7d4fce02e633d3222e Mon Sep 17 00:00:00 2001
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 15 Dec 2011 17:30:33 +0100
Subject: [PATCH 1/2] mlx4: Fix compile error when driver is comiled-in

This patch fixes a compile error that occurs when the driver
is compile into the kernel and not as a module.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 drivers/net/ethernet/mellanox/mlx4/port.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Comments

David Miller Dec. 16, 2011, 8:27 p.m. UTC | #1 
From: Joerg Roedel <joerg.roedel@amd.com>
Date: Thu, 15 Dec 2011 17:48:37 +0100

> Testing my iommu-configs against linux-next found a compile error for
> allyesconfig. It only happens when the mlx4 driver is compiled into the
> kernel and not as a module because these two static functions are also
> used in another file. The attached patch fixes it.
> 
>>From b993c4448c2ce5447fd24e7d4fce02e633d3222e Mon Sep 17 00:00:00 2001
> From: Joerg Roedel <joerg.roedel@amd.com>
> Date: Thu, 15 Dec 2011 17:30:33 +0100
> Subject: [PATCH 1/2] mlx4: Fix compile error when driver is comiled-in
> 
> This patch fixes a compile error that occurs when the driver
> is compile into the kernel and not as a module.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>

I wish we detected "exporting symbol marked static" properly.

I'll apply this, thanks!
--
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
diff mbox

Patch

diff --git a/drivers/net/ethernet/mellanox/mlx4/port.c b/drivers/net/ethernet/mellanox/mlx4/port.c
index 00a9547..88b52e5 100644
--- a/drivers/net/ethernet/mellanox/mlx4/port.c
+++ b/drivers/net/ethernet/mellanox/mlx4/port.c
@@ -783,7 +783,7 @@  int mlx4_SET_PORT(struct mlx4_dev *dev, u8 port)
 	return err;
 }
 
-static int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
+int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
 			  u8 pptx, u8 pfctx, u8 pprx, u8 pfcrx)
 {
 	struct mlx4_cmd_mailbox *mailbox;
@@ -813,7 +813,7 @@  static int mlx4_SET_PORT_general(struct mlx4_dev *dev, u8 port, int mtu,
 }
 EXPORT_SYMBOL(mlx4_SET_PORT_general);
 
-static int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
+int mlx4_SET_PORT_qpn_calc(struct mlx4_dev *dev, u8 port, u32 base_qpn,
 			   u8 promisc)
 {
 	struct mlx4_cmd_mailbox *mailbox;