From patchwork Sat Aug 15 01:49:43 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Chan X-Patchwork-Id: 31466 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 8248EB6F31 for ; Sat, 15 Aug 2009 11:43:26 +1000 (EST) Received: by ozlabs.org (Postfix) id 76DEDDDD1B; Sat, 15 Aug 2009 11:43:26 +1000 (EST) 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 E7B63DDD01 for ; Sat, 15 Aug 2009 11:43:25 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755676AbZHOBnK (ORCPT ); Fri, 14 Aug 2009 21:43:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755556AbZHOBnH (ORCPT ); Fri, 14 Aug 2009 21:43:07 -0400 Received: from mms1.broadcom.com ([216.31.210.17]:3654 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755404AbZHOBnA (ORCPT ); Fri, 14 Aug 2009 21:43:00 -0400 Received: from [10.9.200.133] by mms1.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Fri, 14 Aug 2009 18:42:48 -0700 X-Server-Uuid: 02CED230-5797-4B57-9875-D5D2FEE4708A Received: from mail-irva-13.broadcom.com (10.11.16.103) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.1.375.2; Fri, 14 Aug 2009 18:44:13 -0700 Received: from dell (dhcp-10-12-137-103.broadcom.com [10.12.137.103]) by mail-irva-13.broadcom.com (Postfix) with ESMTP id 3DF1374D04; Fri, 14 Aug 2009 18:42:48 -0700 (PDT) From: "Michael Chan" To: davem@davemloft.net, James.Bottomley@HansenPartnership.com, michaelc@cs.wisc.edu cc: netdev@vger.kernel.org, linux-scsi@vger.kernel.org Subject: [PATCH 1/5] cnic: Fix symbol_put_addr() panic on ia64. Date: Fri, 14 Aug 2009 18:49:43 -0700 Message-ID: <1250300987-18407-2-git-send-email-mchan@broadcom.com> X-Mailer: git-send-email 1.5.5.GIT In-Reply-To: <1250300987-18407-1-git-send-email-mchan@broadcom.com> References: <1250300987-18407-1-git-send-email-mchan@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 6698CD1237016010284-02-01 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When the cnic driver tries to grab a symbol from bnx2 when bnx2 is running init code, symbol_get() will succeed but symbol_put_addr() will hit BUG() a moment later. module_text_address() fails because bnx2 is still in init code. This is fixed by using symbol_put() instead which does the exact opposite of symbol_get(). Signed-off-by: Michael Chan --- drivers/net/cnic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 4869d77..ecde186 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -2543,7 +2543,7 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev) probe = symbol_get(bnx2_cnic_probe); if (probe) { ethdev = (*probe)(dev); - symbol_put_addr(probe); + symbol_put(bnx2_cnic_probe); } if (!ethdev) return NULL;