From patchwork Fri Jun 18 07:38:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= X-Patchwork-Id: 106812 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o5I7dvHO009295 for ; Fri, 18 Jun 2010 07:39:57 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756237Ab0FRHjf (ORCPT ); Fri, 18 Jun 2010 03:39:35 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:41010 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756170Ab0FRHjd (ORCPT ); Fri, 18 Jun 2010 03:39:33 -0400 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.71) (envelope-from ) id 1OPWAm-0003yn-GM; Fri, 18 Jun 2010 09:39:32 +0200 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1OPWAm-00039p-FG; Fri, 18 Jun 2010 09:39:32 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-wireless@vger.kernel.org Subject: [PATCH 2/2] wireless: move regulatory_init to .init.text Date: Fri, 18 Jun 2010 09:38:55 +0200 Message-Id: <1276846735-12105-2-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1276846735-12105-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1276846735-12105-1-git-send-email-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: ukl@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wireless@vger.kernel.org Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Fri, 18 Jun 2010 07:39:58 +0000 (UTC) diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 8f0d97d..994c7c5 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -2630,7 +2630,7 @@ out: mutex_unlock(®_mutex); } -int regulatory_init(void) +int __init regulatory_init(void) { int err = 0; @@ -2676,7 +2676,7 @@ int regulatory_init(void) return 0; } -void regulatory_exit(void) +void /* __init_or_exit */ regulatory_exit(void) { struct regulatory_request *reg_request, *tmp; struct reg_beacon *reg_beacon, *btmp; diff --git a/net/wireless/reg.h b/net/wireless/reg.h index b26224a..c4695d0 100644 --- a/net/wireless/reg.h +++ b/net/wireless/reg.h @@ -10,7 +10,7 @@ int regulatory_hint_user(const char *alpha2); void reg_device_remove(struct wiphy *wiphy); -int regulatory_init(void); +int __init regulatory_init(void); void regulatory_exit(void); int set_regdom(const struct ieee80211_regdomain *rd);