Commit cdea4606 authored by Russell King's avatar Russell King Committed by Russell King

[ARM] Fix some section mismatch warnings

The following patch fixes these section mismatch warnings:

WARNING: arch/arm/mach-at91/built-in.o(.text+0xdf4): Section mismatch: reference to .init.data:dk_nand_partition (between 'nand_partitions' and 'at91_leds_event')
WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions')
WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (between 'nand_partitions' and 'ads7843_pendown_state')
WARNING: arch/arm/mach-at91/built-in.o(.text+0xbdc): Section mismatch: reference to .init.data:ek_nand_partition (after 'nand_partitions')
WARNING: arch/arm/mach-at91/built-in.o(.text+0xc28): Section mismatch: reference to .init.data:kb9202_nand_partition (after 'nand_partitions')
WARNING: arch/arm/mach-footbridge/built-in.o(.text+0xaa4): Section mismatch: reference to .init.data:cats_pci (between 'cats_pci_init' and 'ebsa285_leds_event')WARNING: arch/arm/mach-ixp2000/built-in.o(.text+0xb54): Section mismatch: reference to .init.text:ixp2000_init_irq (between 'ixdp2x00_init_irq' and 'ixdp2x00_irq_handler')
WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x670): Section mismatch: reference to .init.text:ixp23xx_pci_common_init (between 'ixp23xx_pci_slave_init' and 'ixp23xx_pci_scan_bus')
WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x890): Section mismatch: reference to .init.text:ixp23xx_init_irq (between 'ixdp2351_init_irq' and 'roadrunner_pci_preinit')
WARNING: arch/arm/mach-ixp23xx/built-in.o(.text+0x9a8): Section mismatch: reference to .init.text:ixp23xx_pci_preinit (after 'roadrunner_pci_preinit')
WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x80): Section mismatch: reference to .init.text:imx_set_mmc_info (between '__ksymtab_imx_set_mmc_info' and '__ksymtab_set_imx_fb_info')
WARNING: arch/arm/mach-imx/built-in.o(__ksymtab+0x88): Section mismatch: reference to .init.text:set_imx_fb_info (after '__ksymtab_set_imx_fb_info')
WARNING: arch/arm/mach-sa1100/built-in.o(.text+0x1930): Section mismatch: reference to .init.data:neponset_port_fns (between 'neponset_probe' and 'assabet_leds_event')
WARNING: drivers/built-in.o(.text+0x3f100): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
WARNING: drivers/built-in.o(.text+0x3f1c8): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
WARNING: drivers/built-in.o(.text+0x4f988): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
WARNING: drivers/built-in.o(.text+0x4fa50): Section mismatch: reference to .init.text:ps2_clear_input (between 'ps2_probe' and 'ps2_cmd_aborted')
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Acked-by: default avatarLennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 2389b272
...@@ -132,7 +132,7 @@ static struct mtd_partition __initdata dk_nand_partition[] = { ...@@ -132,7 +132,7 @@ static struct mtd_partition __initdata dk_nand_partition[] = {
}, },
}; };
static struct mtd_partition *nand_partitions(int size, int *num_partitions) static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{ {
*num_partitions = ARRAY_SIZE(dk_nand_partition); *num_partitions = ARRAY_SIZE(dk_nand_partition);
return dk_nand_partition; return dk_nand_partition;
......
...@@ -96,7 +96,7 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = { ...@@ -96,7 +96,7 @@ static struct mtd_partition __initdata kb9202_nand_partition[] = {
}, },
}; };
static struct mtd_partition *nand_partitions(int size, int *num_partitions) static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{ {
*num_partitions = ARRAY_SIZE(kb9202_nand_partition); *num_partitions = ARRAY_SIZE(kb9202_nand_partition);
return kb9202_nand_partition; return kb9202_nand_partition;
......
...@@ -178,7 +178,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = { ...@@ -178,7 +178,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
}, },
}; };
static struct mtd_partition *nand_partitions(int size, int *num_partitions) static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{ {
*num_partitions = ARRAY_SIZE(ek_nand_partition); *num_partitions = ARRAY_SIZE(ek_nand_partition);
return ek_nand_partition; return ek_nand_partition;
......
...@@ -180,7 +180,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = { ...@@ -180,7 +180,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
}, },
}; };
static struct mtd_partition *nand_partitions(int size, int *num_partitions) static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{ {
*num_partitions = ARRAY_SIZE(ek_nand_partition); *num_partitions = ARRAY_SIZE(ek_nand_partition);
return ek_nand_partition; return ek_nand_partition;
......
...@@ -87,7 +87,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = { ...@@ -87,7 +87,7 @@ static struct mtd_partition __initdata ek_nand_partition[] = {
}, },
}; };
static struct mtd_partition *nand_partitions(int size, int *num_partitions) static struct mtd_partition * __init nand_partitions(int size, int *num_partitions)
{ {
*num_partitions = ARRAY_SIZE(ek_nand_partition); *num_partitions = ARRAY_SIZE(ek_nand_partition);
return ek_nand_partition; return ek_nand_partition;
......
...@@ -45,7 +45,7 @@ static struct hw_pci cats_pci __initdata = { ...@@ -45,7 +45,7 @@ static struct hw_pci cats_pci __initdata = {
.postinit = dc21285_postinit, .postinit = dc21285_postinit,
}; };
static int cats_pci_init(void) static int __init cats_pci_init(void)
{ {
if (machine_is_cats()) if (machine_is_cats())
pci_common_init(&cats_pci); pci_common_init(&cats_pci);
......
...@@ -201,7 +201,6 @@ void __init imx_set_mmc_info(struct imxmmc_platform_data *info) ...@@ -201,7 +201,6 @@ void __init imx_set_mmc_info(struct imxmmc_platform_data *info)
{ {
imx_mmc_device.dev.platform_data = info; imx_mmc_device.dev.platform_data = info;
} }
EXPORT_SYMBOL(imx_set_mmc_info);
static struct imxfb_mach_info imx_fb_info; static struct imxfb_mach_info imx_fb_info;
......
...@@ -164,7 +164,7 @@ int __init ixdp2400_pci_init(void) ...@@ -164,7 +164,7 @@ int __init ixdp2400_pci_init(void)
subsys_initcall(ixdp2400_pci_init); subsys_initcall(ixdp2400_pci_init);
void ixdp2400_init_irq(void) void __init ixdp2400_init_irq(void)
{ {
ixdp2x00_init_irq(IXDP2400_CPLD_INT_STAT, IXDP2400_CPLD_INT_MASK, IXDP2400_NR_IRQS); ixdp2x00_init_irq(IXDP2400_CPLD_INT_STAT, IXDP2400_CPLD_INT_MASK, IXDP2400_NR_IRQS);
} }
......
...@@ -279,7 +279,7 @@ int __init ixdp2800_pci_init(void) ...@@ -279,7 +279,7 @@ int __init ixdp2800_pci_init(void)
subsys_initcall(ixdp2800_pci_init); subsys_initcall(ixdp2800_pci_init);
void ixdp2800_init_irq(void) void __init ixdp2800_init_irq(void)
{ {
ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2800_NR_IRQS); ixdp2x00_init_irq(IXDP2800_CPLD_INT_STAT, IXDP2800_CPLD_INT_MASK, IXDP2800_NR_IRQS);
} }
......
...@@ -145,7 +145,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = { ...@@ -145,7 +145,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = {
.unmask = ixdp2x00_irq_unmask .unmask = ixdp2x00_irq_unmask
}; };
void ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs) void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs)
{ {
unsigned int irq; unsigned int irq;
......
...@@ -124,7 +124,7 @@ static struct irq_chip ixdp2351_intb_chip = { ...@@ -124,7 +124,7 @@ static struct irq_chip ixdp2351_intb_chip = {
.unmask = ixdp2351_intb_unmask .unmask = ixdp2351_intb_unmask
}; };
void ixdp2351_init_irq(void) void __init ixdp2351_init_irq(void)
{ {
int irq; int irq;
......
...@@ -284,7 +284,7 @@ int ixp23xx_pci_setup(int nr, struct pci_sys_data *sys) ...@@ -284,7 +284,7 @@ int ixp23xx_pci_setup(int nr, struct pci_sys_data *sys)
return 1; return 1;
} }
void ixp23xx_pci_slave_init(void) void __init ixp23xx_pci_slave_init(void)
{ {
ixp23xx_pci_common_init(); ixp23xx_pci_common_init();
} }
...@@ -110,7 +110,7 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin) ...@@ -110,7 +110,7 @@ static int __init roadrunner_map_irq(struct pci_dev *dev, u8 idsel, u8 pin)
return NO_IRQ; return NO_IRQ;
} }
static void roadrunner_pci_preinit(void) static void __init roadrunner_pci_preinit(void)
{ {
set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW); set_irq_type(IRQ_ROADRUNNER_PCI_INTC, IRQT_LOW);
set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW); set_irq_type(IRQ_ROADRUNNER_PCI_INTD, IRQT_LOW);
......
...@@ -139,12 +139,12 @@ static u_int neponset_get_mctrl(struct uart_port *port) ...@@ -139,12 +139,12 @@ static u_int neponset_get_mctrl(struct uart_port *port)
return ret; return ret;
} }
static struct sa1100_port_fns neponset_port_fns __initdata = { static struct sa1100_port_fns neponset_port_fns __devinitdata = {
.set_mctrl = neponset_set_mctrl, .set_mctrl = neponset_set_mctrl,
.get_mctrl = neponset_get_mctrl, .get_mctrl = neponset_get_mctrl,
}; };
static int neponset_probe(struct platform_device *dev) static int __devinit neponset_probe(struct platform_device *dev)
{ {
sa1100_register_uart_fns(&neponset_port_fns); sa1100_register_uart_fns(&neponset_port_fns);
......
...@@ -170,7 +170,7 @@ static void ps2_close(struct serio *io) ...@@ -170,7 +170,7 @@ static void ps2_close(struct serio *io)
/* /*
* Clear the input buffer. * Clear the input buffer.
*/ */
static void __init ps2_clear_input(struct ps2if *ps2if) static void __devinit ps2_clear_input(struct ps2if *ps2if)
{ {
int maxread = 100; int maxread = 100;
...@@ -228,7 +228,7 @@ static int __init ps2_test(struct ps2if *ps2if) ...@@ -228,7 +228,7 @@ static int __init ps2_test(struct ps2if *ps2if)
/* /*
* Add one device to this driver. * Add one device to this driver.
*/ */
static int ps2_probe(struct sa1111_dev *dev) static int __devinit ps2_probe(struct sa1111_dev *dev)
{ {
struct ps2if *ps2if; struct ps2if *ps2if;
struct serio *serio; struct serio *serio;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment