Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80ea2065 authored Feb 03, 2012 by Russell King

ARM: sa11x0: fix section mismatch warnings



Neponset calls sa1110_mb_disable() from __devinit code, but
sa1110_mb_disable() is marked __init, and so causes a section
mismatch warning.

As sa1110_mb_enable() and sa1110_mb_disable() need to be callable
from suspend/resume paths as well, they must not be marked __init
or __devinit.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent f3bb3d74

arch/arm/common/sa1111.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -87,7 +87,7 @@
	#define IRQ_S0_BVD1_STSCHG (53)		#define IRQ_S0_BVD1_STSCHG (53)
	#define IRQ_S1_BVD1_STSCHG (54)		#define IRQ_S1_BVD1_STSCHG (54)

	extern void __init sa1110_mb_enable(void);		extern void sa1110_mb_enable(void);

	/*		/*
	* We keep the following data for the overall SA1111. Note that the		* We keep the following data for the overall SA1111. Note that the

arch/arm/mach-sa1100/generic.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -428,7 +428,7 @@ void __init sa1100_map_io(void)
	* the MBGNT signal false to ensure the SA1111 doesn't own the		* the MBGNT signal false to ensure the SA1111 doesn't own the
	* SDRAM bus.		* SDRAM bus.
	*/		*/
	void __init sa1110_mb_disable(void)		void sa1110_mb_disable(void)
	{		{
	unsigned long flags;		unsigned long flags;

	@@ -447,7 +447,7 @@ void __init sa1110_mb_disable(void)
	* If the system is going to use the SA-1111 DMA engines, set up		* If the system is going to use the SA-1111 DMA engines, set up
	* the memory bus request/grant pins.		* the memory bus request/grant pins.
	*/		*/
	void __devinit sa1110_mb_enable(void)		void sa1110_mb_enable(void)
	{		{
	unsigned long flags;		unsigned long flags;