Skip to contentSkip to conversation

iwl3945: fix ia64/ppc build

PATCH In review Jan Beulich 2 participants 2 messages May 5, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iwl3945: fix ia64/ppc build

Exporting static and non-static symbols in the same compilation unit results, on some architectures, in section mismatch errors from the compiler. Since exporting static symbols is bogus altogether, simply remove the offending export. Once at it, also remove the other export commit df833b1d73680f9f9dc72cbc3215edbbc6ab740d pointlessly added.

Cc Reinette Chatre <[email protected]>
Cc John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -2
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_p
 	rxq->free_count = 0;
 	spin_unlock_irqrestore(&rxq->lock, flags);
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_reset);
 
 /*
  * this should be called while priv->lock is locked
@@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct
 	rxq->bd = NULL;
 	rxq->rb_stts  = NULL;
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_free);
 
 
 /* Convert linear signal-to-noise ratio into dB */
#1 lore raw

Jan,

Quoted 28 lines · Jan Beulich

Exporting static and non-static symbols in the same compilation unit results, on some architectures, in section mismatch errors from the compiler. Since exporting static symbols is bogus altogether, simply remove the offending export. Once at it, also remove the other export commit df833b1d73680f9f9dc72cbc3215edbbc6ab740d pointlessly added.

Cc Reinette Chatre <[email protected]>
Cc John W. Linville <[email protected]>
---
 drivers/net/wireless/iwlwifi/iwl3945-base.c |    2 --
 1 file changed, 2 deletions(-)
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -1
@@ -1694,7 +1694,6 @@ void iwl3945_rx_queue_reset(struct iwl_p
 	rxq->free_count = 0;
 	spin_unlock_irqrestore(&rxq->lock, flags);
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_reset);
 
 /*
  * this should be called while priv->lock is locked

drivers/net/wireless/iwlwifi/iwl3945-base.c static void iwl3945_rx_queue_free(struct · line 1749

Quoted 7 lines
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -1
@@ -1745,7 +1744,6 @@ static void iwl3945_rx_queue_free(struct
 	rxq->bd = NULL;
 	rxq->rb_stts  = NULL;
 }
-EXPORT_SYMBOL(iwl3945_rx_queue_free);
 
 
 /* Convert linear signal-to-noise ratio into dB */

These changes are already queued for 2.6.30 in wireless-2.6 as commit 6269b731560d69c5eaa929909891edec39496d71 and 3ee59f8d0dcab2e114546038b2b224776c82b7f7

Reinette