Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

sections: fix section conflicts in arch/mips

Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Andi Kleen and committed by
Linus Torvalds
3cf5ae6e dd47a8bd

+2 -2
+1 -1
arch/mips/bcm63xx/boards/board_bcm963xx.c
··· 632 632 /* 633 633 * all boards 634 634 */ 635 - static const struct board_info __initdata *bcm963xx_boards[] = { 635 + static const struct board_info __initconst *bcm963xx_boards[] = { 636 636 #ifdef CONFIG_BCM63XX_CPU_6328 637 637 &board_96328avng, 638 638 #endif
+1 -1
arch/mips/pci/pci-octeon.c
··· 58 58 } s; 59 59 }; 60 60 61 - int __initdata (*octeon_pcibios_map_irq)(const struct pci_dev *dev, 61 + int __initconst (*octeon_pcibios_map_irq)(const struct pci_dev *dev, 62 62 u8 slot, u8 pin); 63 63 enum octeon_dma_bar_type octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_INVALID; 64 64