diff options
| author | Nicolas Pitre | 2015-07-28 00:27:52 +0200 |
|---|---|---|
| committer | Olof Johansson | 2015-07-28 13:55:27 +0200 |
| commit | 19c233b79d1af7b5af1ec68c1172848648184449 (patch) | |
| tree | 72f3f43b983202fdc3483f803778e3d7c2f457c0 /arch/arm/mach-cns3xxx | |
| parent | Merge tag 'renesas-cleanup2-for-v4.3' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| download | kernel-qcow2-linux-19c233b79d1af7b5af1ec68c1172848648184449.tar.gz kernel-qcow2-linux-19c233b79d1af7b5af1ec68c1172848648184449.tar.xz kernel-qcow2-linux-19c233b79d1af7b5af1ec68c1172848648184449.zip | |
ARM: appropriate __init annotation for const data
Init data marked const should be annotated with __initconst for
correctness and not __initdata. In some cases the array gathering
references to that data has to be marked const as well. This fixes
LTO builds that otherwise fail with section mismatch errors.
Signed-off-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-cns3xxx')
| -rw-r--r-- | arch/arm/mach-cns3xxx/core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-cns3xxx/core.c b/arch/arm/mach-cns3xxx/core.c index 11f9644f8f41..9b1dc223d8d3 100644 --- a/arch/arm/mach-cns3xxx/core.c +++ b/arch/arm/mach-cns3xxx/core.c @@ -346,7 +346,7 @@ static struct usb_ohci_pdata cns3xxx_usb_ohci_pdata = { .power_off = csn3xxx_usb_power_off, }; -static struct of_dev_auxdata cns3xxx_auxdata[] __initconst = { +static const struct of_dev_auxdata const cns3xxx_auxdata[] __initconst = { { "intel,usb-ehci", CNS3XXX_USB_BASE, "ehci-platform", &cns3xxx_usb_ehci_pdata }, { "intel,usb-ohci", CNS3XXX_USB_OHCI_BASE, "ohci-platform", &cns3xxx_usb_ohci_pdata }, { "cavium,cns3420-ahci", CNS3XXX_SATA2_BASE, "ahci", NULL }, @@ -399,7 +399,7 @@ static void __init cns3xxx_init(void) cns3xxx_auxdata, NULL); } -static const char *cns3xxx_dt_compat[] __initdata = { +static const char *const cns3xxx_dt_compat[] __initconst = { "cavium,cns3410", "cavium,cns3420", NULL, |