From patchwork Fri Jul 23 19:58:30 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: 113989 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6NK2IT2027823 for ; Fri, 23 Jul 2010 20:02:18 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760636Ab0GWUBE (ORCPT ); Fri, 23 Jul 2010 16:01:04 -0400 Received: from metis.ext.pengutronix.de ([92.198.50.35]:43159 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757342Ab0GWT7L (ORCPT ); Fri, 23 Jul 2010 15:59:11 -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 1OcOOe-00019A-TJ; Fri, 23 Jul 2010 21:59:04 +0200 Received: from ukl by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1OcOOb-0002T9-QV; Fri, 23 Jul 2010 21:59:01 +0200 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= To: linux-arm-kernel@lists.infradead.org Cc: Tony Lindgren , Russell King , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Tomi Valkeinen , Santosh Shilimkar , Paul Walmsley , janboe , linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] ARM: omap: move omapfb_reserve_sram() to .init.text Date: Fri, 23 Jul 2010 21:58:30 +0200 Message-Id: <1279915120-4373-7-git-send-email-u.kleine-koenig@pengutronix.de> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1279915120-4373-1-git-send-email-u.kleine-koenig@pengutronix.de> References: <1279915120-4373-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-omap@vger.kernel.org Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@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, 23 Jul 2010 20:02:19 +0000 (UTC) diff --git a/arch/arm/plat-omap/fb.c b/arch/arm/plat-omap/fb.c index 4df210f..4c0ae4d 100644 --- a/arch/arm/plat-omap/fb.c +++ b/arch/arm/plat-omap/fb.c @@ -233,7 +233,7 @@ void __init omapfb_reserve_sdram(void) * this point, since the driver built as a module would have problem with * freeing / reallocating the regions. */ -unsigned long omapfb_reserve_sram(unsigned long sram_pstart, +unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart, unsigned long sram_vstart, unsigned long sram_size, unsigned long pstart_avail, @@ -360,7 +360,7 @@ static int __init omap_init_fb(void) arch_initcall(omap_init_fb); void __init omapfb_reserve_sdram(void) {} -unsigned long omapfb_reserve_sram(unsigned long sram_pstart, +unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart, unsigned long sram_vstart, unsigned long sram_size, unsigned long start_avail, @@ -376,7 +376,7 @@ void omapfb_set_platform_data(struct omapfb_platform_data *data) } void __init omapfb_reserve_sdram(void) {} -unsigned long omapfb_reserve_sram(unsigned long sram_pstart, +unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart, unsigned long sram_vstart, unsigned long sram_size, unsigned long start_avail, diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c index 226b2e8..ccd6623 100644 --- a/arch/arm/plat-omap/sram.c +++ b/arch/arm/plat-omap/sram.c @@ -79,7 +79,7 @@ static unsigned long omap_sram_base; static unsigned long omap_sram_size; static unsigned long omap_sram_ceil; -extern unsigned long omapfb_reserve_sram(unsigned long sram_pstart, +extern unsigned long __init omapfb_reserve_sram(unsigned long sram_pstart, unsigned long sram_vstart, unsigned long sram_size, unsigned long pstart_avail,